openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

migration: set f->is_write and flush in add_to_iovec 

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-04-08 13:29:54 +02:00 committed by Juan Quintela
parent 47b5264eb3
commit af74db72d3
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
savevm.c
View File

@ -631,6 +631,11 @@ static void add_to_iovec(QEMUFile *f, const uint8_t *buf, int size)
f->iov[f->iovcnt].iov_base = (uint8_t *)buf; f->iov[f->iovcnt].iov_base = (uint8_t *)buf;
f->iov[f->iovcnt++].iov_len = size; f->iov[f->iovcnt++].iov_len = size;
} }
f->is_write = 1;
if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) {
qemu_fflush(f);
}
} }
void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size) void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size)
@ -645,14 +650,8 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size)
abort(); abort();
} }
add_to_iovec(f, buf, size);
f->is_write = 1;
f->bytes_xfer += size; f->bytes_xfer += size;
add_to_iovec(f, buf, size);
if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) {
qemu_fflush(f);
}
} }
void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size) void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size)
@ -674,7 +673,6 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, int size)
if (l > size) if (l > size)
l = size; l = size;
memcpy(f->buf + f->buf_index, buf, l); memcpy(f->buf + f->buf_index, buf, l);
f->is_write = 1;
f->buf_index += l; f->buf_index += l;
qemu_put_buffer_async(f, f->buf + (f->buf_index - l), l); qemu_put_buffer_async(f, f->buf + (f->buf_index - l), l);
if (qemu_file_get_error(f)) { if (qemu_file_get_error(f)) {
@ -697,15 +695,10 @@ void qemu_put_byte(QEMUFile *f, int v)
abort(); abort();
} }
f->buf[f->buf_index++] = v; f->buf[f->buf_index] = v;
f->is_write = 1;
f->bytes_xfer++; f->bytes_xfer++;
add_to_iovec(f, f->buf + f->buf_index, 1);
add_to_iovec(f, f->buf + (f->buf_index - 1), 1); f->buf_index++;
if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) {
qemu_fflush(f);
}
} }
static void qemu_file_skip(QEMUFile *f, int size) static void qemu_file_skip(QEMUFile *f, int size)