Commit 425ff510 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

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: default avatarAnthony Liguori <aliguori@amazon.com>
parents 394cfa39 8e86729a

savevm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

        }