Hi
This pull includes:
- fixes from (peter xu)
- page-size parameter for info migrate (chao)
- Fix for virtio-rng migration with postcopy (laurent)
- RAMState series cleanup (me)
Please apply.
The following changes since commit fa54abb8c298f892639ffc4bc2f61448ac3be4a1:
Drop QEMU_GNUC_PREREQ() checks for gcc older than 4.1 (2017-04-20 18:33:33 +0100)
are available in the git repository at:
git://github.com/juanquintela/qemu.git tags/migration/20170421
for you to fetch changes up to 2c02468c9b1750aaa5fbeee49cdb55f101608c6a:
hmp: info migrate_parameters format tunes (2017-04-21 12:25:41 +0200)
----------------------------------------------------------------
migration/next for 20170421
----------------------------------------------------------------
Chao Fan (1):
ram: Add page-size to output in 'info migrate'
Juan Quintela (58):
ram: Update all functions comments
ram: Rename flush_page_queue() to migration_page_queue_free()
ram: Rename block_name to rbname
ram: Create RAMState
ram: Add dirty_rate_high_cnt to RAMState
ram: Move bitmap_sync_count into RAMState
ram: Move start time into RAMState
ram: Move bytes_xfer_prev into RAMState
ram: Change byte_xfer_{prev,now} type to uint64_t
ram: Move num_dirty_pages_period into RAMState
ram: Change num_dirty_pages_period type to uint64_t
ram: Move xbzrle_cache_miss_prev into RAMState
ram: Move iterations_prev into RAMState
ram: Move dup_pages into RAMState
ram: Remove unused dup_mig_bytes_transferred()
ram: Remove unused pages_skipped variable
ram: Move norm_pages to RAMState
ram: Remove norm_mig_bytes_transferred
ram: Move iterations into RAMState
ram: Move xbzrle_bytes into RAMState
ram: Move xbzrle_pages into RAMState
ram: Move xbzrle_cache_miss into RAMState
ram: Move xbzrle_cache_miss_rate into RAMState
ram: Move xbzrle_overflows into RAMState
ram: Move migration_dirty_pages to RAMState
ram: Everything was init to zero, so use memset
ram: Move migration_bitmap_mutex into RAMState
ram: Move migration_bitmap_rcu into RAMState
ram: Move bytes_transferred into RAMState
ram: Use the RAMState bytes_transferred parameter
ram: Remove ram_save_remaining
ram: Move last_req_rb to RAMState
ram: Move src_page_req* to RAMState
ram: Create ram_dirty_sync_count()
ram: Remove dirty_bytes_rate
ram: Move dirty_pages_rate to RAMState
ram: Move postcopy_requests into RAMState
ram: Add QEMUFile to RAMState
ram: Move QEMUFile into RAMState
ram: Remove compression_switch and inline its logic
migration: Remove MigrationState from migration_in_postcopy
ram: We don't need MigrationState parameter anymore
ram: Rename qemu_target_page_bits() to qemu_target_page_size()
ram: Pass RAMBlock to bitmap_sync
ram: ram_discard_range() don't use the mis parameter
ram: reorganize last_sent_block
ram: Use page number instead of an address for the bitmap operations
ram: Remember last_page instead of last_offset
ram: Change offset field in PageSearchStatus to page
ram: Use ramblock and page offset instead of absolute offset
ram: rename last_ram_offset() last_ram_pages()
ram: Use RAMBitmap type for coherence
migration: Remove MigrationState parameter from migration_is_idle()
qdev: qdev_hotplug is really a bool
qdev: Export qdev_hot_removed
qdev: Move qdev_unplug() to qdev-monitor.c
migration: Disable hotplug/unplug during migration
ram: Remove migration_bitmap_extend()
Laurent Vivier (2):
migration: don't close a file descriptor while it can be in use
virtio-rng: stop virtqueue while the CPU is stopped
Peter Xu (4):
migration: set current_active_state once
migration: rename max_size to threshold_size
hmp: info migrate_capability format tunes
hmp: info migrate_parameters format tunes
exec.c | 11 +-
hmp.c | 29 +-
hw/core/qdev.c | 40 +-
hw/virtio/trace-events | 3 +
hw/virtio/virtio-rng.c | 29 +-
include/exec/ram_addr.h | 8 +-
include/hw/qdev-core.h | 3 +-
include/hw/virtio/virtio-rng.h | 2 +
include/migration/migration.h | 41 +-
include/migration/vmstate.h | 3 +-
include/sysemu/sysemu.h | 2 +-
migration/migration.c | 82 +--
migration/postcopy-ram.c | 14 +-
migration/ram.c | 1210 +++++++++++++++++++++-------------------
migration/savevm.c | 19 +-
migration/trace-events | 4 +-
qapi-schema.json | 5 +-
qdev-monitor.c | 45 ++
18 files changed, 805 insertions(+), 745 deletions(-)