Paolo Bonzini <pbonz...@redhat.com> writes: > Anthony, > > the following changes since commit 7dc65c02fe3fb8f3146ce0b9ff5fec5945329f0e: > > Open 2.0 development tree (2013-11-27 14:02:45 -0800)
This also conflicts badly. Regards, Anthony Liguori > > are available in the git repository at: > > git://github.com/bonzini/qemu.git virtio > > for you to fetch changes up to 306ec6c3cece7004429c79c1ac93d49919f1f1cc: > > virtio: Convert exit to unrealize (2013-12-09 21:46:49 +0100) > > The patches were acked by Andreas. > ---------------------------------------------------------------- > Andreas Färber (18): > virtio-blk-dataplane: Improve error reporting > virtio-9p: QOM realize preparations > virtio-blk: QOM realize preparations > virtio-serial: QOM realize preparations > virtio-net: QOM realize preparations > virtio-balloon: QOM realize preparations > virtio-rng: QOM realize preparations > virtio-scsi: QOM realize preparations > virtio: Start converting VirtioDevice to QOM realize > virtio-9p: Convert to QOM realize > virtio-blk: Convert to QOM realize > virtio-serial: Convert to QOM realize > virtio-net: Convert to QOM realize > virtio-balloon: Convert to QOM realize > virtio-rng: Convert to QOM realize > virtio-scsi: Convert to QOM realize > virtio: Complete converting VirtioDevice to QOM realize > virtio: Convert exit to unrealize > > Paolo Bonzini (12): > virtio-ccw: move virtio_ccw_stop_ioeventfd to virtio_ccw_busdev_unplug > virtio-bus: remove vdev field > virtio-ccw: remove vdev field > virtio-pci: remove vdev field > virtio-bus: cleanup plug/unplug interface > virtio-blk: switch exit callback to VirtioDeviceClass > virtio-serial: switch exit callback to VirtioDeviceClass > virtio-net: switch exit callback to VirtioDeviceClass > virtio-scsi: switch exit callback to VirtioDeviceClass > virtio-balloon: switch exit callback to VirtioDeviceClass > virtio-rng: switch exit callback to VirtioDeviceClass > virtio-pci: add device_unplugged callback > > hw/9pfs/virtio-9p-device.c | 43 +++++++------- > hw/block/dataplane/virtio-blk.c | 30 +++++----- > hw/block/dataplane/virtio-blk.h | 5 +- > hw/block/virtio-blk.c | 47 ++++++++++------ > hw/char/virtio-serial-bus.c | 33 +++++------ > hw/net/virtio-net.c | 36 ++++++------ > hw/s390x/virtio-ccw.c | 83 +++++++++++++++------------ > hw/s390x/virtio-ccw.h | 1 - > hw/scsi/vhost-scsi.c | 45 +++++++-------- > hw/scsi/virtio-scsi.c | 57 +++++++++---------- > hw/virtio/virtio-balloon.c | 32 +++++------ > hw/virtio/virtio-bus.c | 80 +++++++++++++++----------- > hw/virtio/virtio-mmio.c | 9 +-- > hw/virtio/virtio-pci.c | 122 > ++++++++++++++++++++++++---------------- > hw/virtio/virtio-pci.h | 1 - > hw/virtio/virtio-rng.c | 43 +++++++------- > hw/virtio/virtio.c | 40 ++++++++----- > include/hw/virtio/virtio-bus.h | 22 +++++--- > include/hw/virtio/virtio-rng.h | 2 + > include/hw/virtio/virtio-scsi.h | 4 +- > include/hw/virtio/virtio.h | 8 ++- > tests/qdev-monitor-test.c | 4 +- > 22 files changed, 413 insertions(+), 334 deletions(-) > -- > 1.8.4.2
