diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-11-21 07:08:31 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-11-21 07:08:31 -0800 |
| commit | 425ff5102f8668d5c921e2a1d77ee9173742bfdf (patch) | |
| tree | e963b562a7e7abdc19a932c7777dc8d68c3b865c | |
| parent | 394cfa39ba24dd838ace1308ae24961243947fb8 (diff) | |
| parent | 8e86729a0e83b557c22808a2337252c969ca3986 (diff) | |
| download | focaccia-qemu-425ff5102f8668d5c921e2a1d77ee9173742bfdf.tar.gz focaccia-qemu-425ff5102f8668d5c921e2a1d77ee9173742bfdf.zip | |
Merge remote-tracking branch 'quintela/migration.next' into staging
# By Wangting (Kathy) # Via Juan Quintela * quintela/migration.next: The calculation of bytes_xfer in qemu_put_buffer() is wrong Message-id: 1384946787-8190-1-git-send-email-quintela@redhat.com Signed-off-by: Anthony Liguori <aliguori@amazon.com>
| -rw-r--r-- | savevm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/savevm.c b/savevm.c index 2f631d4045..3f912ddcf9 100644 --- a/savevm.c +++ b/savevm.c @@ -794,7 +794,7 @@ 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->bytes_xfer += size; + f->bytes_xfer += l; if (f->ops->writev_buffer) { add_to_iovec(f, f->buf + f->buf_index, l); } |