Failed in applying to current master (
apply log)
hw/display/virtio-gpu.c | 99 +++++++++++----------
hw/net/virtio-net.c | 133 ++++++++++++++--------------
hw/nvram/eeprom93xx.c | 17 ++--
hw/nvram/fw_cfg.c | 24 ++---
hw/pci/msix.c | 17 ++--
hw/pci/pci.c | 85 +++++++++---------
hw/pci/shpc.c | 20 +++--
hw/s390x/virtio-ccw.c | 40 ++++-----
hw/scsi/scsi-bus.c | 17 ++--
hw/scsi/spapr_vscsi.c | 9 +-
hw/usb/redirect.c | 59 +++++++------
hw/vfio/pci.c | 14 ++-
hw/virtio/vhost-user-fs.c | 68 +++++++-------
hw/virtio/virtio-mmio.c | 31 +++----
hw/virtio/virtio-pci.c | 45 +++++-----
hw/virtio/virtio.c | 157 +++++++++++++++++----------------
include/hw/pci/pci.h | 4 +-
include/hw/virtio/virtio-bus.h | 8 +-
include/hw/virtio/virtio.h | 4 -
include/migration/vmstate.h | 17 ----
migration/vmstate-types.c | 17 ++--
migration/vmstate.c | 32 +------
target/alpha/machine.c | 17 ++--
target/arm/machine.c | 107 +++++++++++-----------
target/avr/machine.c | 50 ++++++-----
target/hppa/machine.c | 34 +++----
target/microblaze/machine.c | 17 ++--
target/mips/system/machine.c | 49 +++++-----
target/or1k/machine.c | 17 ++--
target/ppc/machine.c | 80 ++++++++---------
target/sparc/machine.c | 68 +++++++-------
tests/unit/test-vmstate.c | 118 +++++++------------------
ui/vdagent.c | 38 ++++----
33 files changed, 710 insertions(+), 802 deletions(-)