diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-03-16 14:45:09 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-03-16 14:45:09 +0000 |
| commit | bc68d2e5128284c8beb98b1c5b0331a0ed9f3197 (patch) | |
| tree | 1b195e276395920f19d7c8ca30aafb90416ebc71 /migration/rdma.c | |
| parent | dcf848c478dd8765bd4f746fc4e80eaad44cf87d (diff) | |
| parent | 54ed388b29794ab08089f1b5c7b0a03d075c3b5d (diff) | |
| download | focaccia-qemu-bc68d2e5128284c8beb98b1c5b0331a0ed9f3197.tar.gz focaccia-qemu-bc68d2e5128284c8beb98b1c5b0331a0ed9f3197.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150316' into staging
migration/next for 20150316 # gpg: Signature made Mon Mar 16 13:36:37 2015 GMT using RSA key ID 5872D723 # gpg: Can't check signature: public key not found * remotes/juanquintela/tags/migration/20150316: pc: Disable vmdesc submission for old machines migration: Allow to suppress vmdesc submission migration: Read JSON VM description on incoming migration rename save_block_hdr to save_page_header save_block_hdr: we can recalculate the cont parameter here save_xbzrle_page: change calling convention ram_save_page: change calling covention ram_find_and_save_block: change calling convention ram: make all save_page functions take a uint64_t parameter Add migrate_incoming Add -incoming defer Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration/rdma.c')
| -rw-r--r-- | migration/rdma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/migration/rdma.c b/migration/rdma.c index 42d443cc64..d1c19ffdac 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2654,7 +2654,7 @@ static int qemu_rdma_close(void *opaque) */ static size_t qemu_rdma_save_page(QEMUFile *f, void *opaque, ram_addr_t block_offset, ram_addr_t offset, - size_t size, int *bytes_sent) + size_t size, uint64_t *bytes_sent) { QEMUFileRDMA *rfile = opaque; RDMAContext *rdma = rfile->rdma; |