diff options
| author | Peter Maydell | 2018-06-28 16:31:42 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-28 16:31:42 +0200 |
| commit | 4a83bf2f339d4b63ecd5ef48b9816c3b7ee24553 (patch) | |
| tree | 17521dfbeca338210998624e41446841d956e7bb /include | |
| parent | Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-2018-06-27' i... (diff) | |
| parent | migration: fix crash in when incoming client channel setup fails (diff) | |
| download | qemu-4a83bf2f339d4b63ecd5ef48b9816c3b7ee24553.tar.gz qemu-4a83bf2f339d4b63ecd5ef48b9816c3b7ee24553.tar.xz qemu-4a83bf2f339d4b63ecd5ef48b9816c3b7ee24553.zip | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20180627' into staging
migration/next for 20180627
# gpg: Signature made Wed 27 Jun 2018 13:53:53 BST
# gpg: using RSA key F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>"
# gpg: aka "Juan Quintela <quintela@trasno.org>"
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* remotes/juanquintela/tags/migration/20180627:
migration: fix crash in when incoming client channel setup fails
postcopy: drop ram_pages parameter from postcopy_ram_incoming_init()
migration: Stop sending whole pages through main channel
migration: Remove not needed semaphore and quit
migration: Wait for blocking IO
migration: Start sending messages
migration: Create ram_save_multifd_page
migration: Create multifd_bytes ram_counter
migration: Synchronize multifd threads with main thread
migration: Add block where to send/receive packets
migration: Multifd channels always wait on the sem
migration: Add multifd traces for start/end thread
migration: Abstract the number of bytes sent
migration: Calculate mbps only during transfer time
migration: Create multifd packet
migration: Create multipage support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/exec/ram_addr.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index cf2446a176..33c361cad5 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -71,7 +71,6 @@ static inline unsigned long int ramblock_recv_bitmap_offset(void *host_addr, } long qemu_getrampagesize(void); -unsigned long last_ram_page(void); RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr, bool share, const char *mem_path, Error **errp); |