aboutsummaryrefslogtreecommitdiff
path: root/savevm.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-04-08 13:29:54 +0200
committerJuan Quintela <quintela@redhat.com>2013-04-09 15:00:13 +0200
commitaf74db72d33e4776d7d1430b57d0bf065a6f03df (patch)
treeef07c01f79665632e460d9944a594f6b7128d2d6 /savevm.c
parent47b5264eb3e1cd2825e48d28fd0d1b239ed53974 (diff)
downloadqemu-arm-af74db72d33e4776d7d1430b57d0bf065a6f03df.tar.gz
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>
Diffstat (limited to 'savevm.c')
-rw-r--r--savevm.c25
1 files changed, 9 insertions, 16 deletions
diff --git a/savevm.c b/savevm.c
index b1d8988c78..c952c41057 100644
--- a/savevm.c
+++ b/savevm.c
@@ -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_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)
@@ -645,14 +650,8 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size)
abort();
}
- add_to_iovec(f, buf, size);
-
- f->is_write = 1;
f->bytes_xfer += size;
-
- if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) {
- qemu_fflush(f);
- }
+ add_to_iovec(f, buf, 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)
l = size;
memcpy(f->buf + f->buf_index, buf, l);
- f->is_write = 1;
f->buf_index += l;
qemu_put_buffer_async(f, f->buf + (f->buf_index - l), l);
if (qemu_file_get_error(f)) {
@@ -697,15 +695,10 @@ void qemu_put_byte(QEMUFile *f, int v)
abort();
}
- f->buf[f->buf_index++] = v;
- f->is_write = 1;
+ f->buf[f->buf_index] = v;
f->bytes_xfer++;
-
- add_to_iovec(f, f->buf + (f->buf_index - 1), 1);
-
- if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) {
- qemu_fflush(f);
- }
+ add_to_iovec(f, f->buf + f->buf_index, 1);
+ f->buf_index++;
}
static void qemu_file_skip(QEMUFile *f, int size)