Hello Peter, This is my QOM (devices) patch queue. Please pull.
Regards, Andreas Cc: Peter Maydell <peter.mayd...@linaro.org> The following changes since commit b1d28ec6a7dbdaadda39d29322f0de694aeb0b74: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20141010' into staging (2014-10-10 14:55:29 +0100) are available in the git repository at: git://github.com/afaerber/qemu-cpu.git tags/qom-devices-for-peter for you to fetch changes up to 18b91a3e082e7111455fd69ab43181831f8e0169: qdev: Drop legacy_name from qdev properties (2014-10-15 05:03:15 +0200) ---------------------------------------------------------------- QOM infrastructure fixes and device conversions * GPIO conversion to QOM, continued * Device property description support * QTest cases for hotplug * Hotplug handler conversion ---------------------------------------------------------------- Gonglei (7): qom: Add error handler for object_property_print() qom: Add error handler for object alias property qdev: Add description field in PropertyInfo struct qom: Add description field in ObjectProperty struct qdev: Set the object property's description to the qdev property's. qmp: Print descriptions of object properties qdev: Drop legacy_name from qdev properties Igor Mammedov (37): tests: virtio-scsi: Check if hot-plug/unplug works tests: virtio-serial: Check if hot-plug/unplug works libqos: Add qpci_plug_device_test() and qpci_unplug_acpi_device_test() tests: virtio-rng: Check if hot-plug/unplug works tests: virtio-net: Check if hot-plug/unplug works tests: virtio-blk: Check if hot-plug/unplug works tests: usb: Move uhci port test code to libqos/usb.c tests: usb: add port test to uhci unit test tests: usb: Generic usb device hotplug tests: usb: usb-storage hotplug test tests: usb: usb-uas hotplug test Access BusState::allow_hotplug using wraper qbus_is_hotpluggable() qdev: do not allow to instantiate non hotpluggable device with device_add qdev: HotplugHandler: Rename unplug callback to unplug_request qdev: HotplugHandler: Provide unplug callback qdev: Add simple/generic unplug callback for HotplugHandler qdev: Add wrapper to set BUS as HotplugHandler qdev: Drop hotplug check from bus_add_child() target-i386: ICC bus: Drop BusState::allow_hotplug virtio-pci: Drop BusState::allow_hotplug virtio-serial: Convert to hotplug-handler API virtio-mmio: Drop useless bus->allow_hotplug = 0 s390x: Drop not used allow_hotplug in event-facility s390x: Convert s390-virtio to hotplug handler API s390x: Convert virtio-ccw to hotplug handler API scsi: Set SCSI BUS itself as default HotplugHandler scsi: Convert pvscsi HBA to hotplug handler API scsi: Convert virtio-scsi HBA to hotplug handler API scsi: Cleanup not used anymore SCSIBusInfo{hotplug, hot_unplug} fields usb-bot: Mark device as non hotpluggable usb-bot: Drop not needed "allow_hotplug = 0" usb-storage: Drop not needed "allow_hotplug = 0" usb: Convert usb-ccid to hotplug handler API usb: Convert usb devices to hotplug handler API qdev: Drop legacy hotplug fields/methods qdev: HotplugHandler: Add support for unplugging BUS-less devices qdev: device_del: Search for to be unplugged device in 'peripheral' container Peter Crosthwaite (3): qdev: gpio: Don't allow name share between I and O qdev: gpio: Register GPIO inputs as child objects qdev: gpio: Register GPIO outputs as QOM links hw/acpi/piix4.c | 6 +-- hw/char/virtio-serial-bus.c | 20 +++++-- hw/core/hotplug.c | 11 ++++ hw/core/qdev-properties-system.c | 8 +-- hw/core/qdev-properties.c | 14 ++--- hw/core/qdev.c | 113 +++++++++++++++++++++++++++++---------- hw/cpu/icc_bus.c | 8 --- hw/i386/acpi-build.c | 2 +- hw/isa/lpc_ich9.c | 6 +-- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci/pci-hotplug-old.c | 4 +- hw/pci/pcie.c | 4 +- hw/pci/pcie_port.c | 2 +- hw/pci/shpc.c | 4 +- hw/s390x/event-facility.c | 2 - hw/s390x/s390-virtio-bus.c | 10 ++-- hw/s390x/virtio-ccw.c | 17 +++--- hw/scsi/scsi-bus.c | 24 +++------ hw/scsi/virtio-scsi.c | 30 +++++++---- hw/scsi/vmw_pvscsi.c | 26 ++++++--- hw/usb/bus.c | 9 +++- hw/usb/dev-smartcard-reader.c | 8 ++- hw/usb/dev-storage.c | 4 +- hw/virtio/virtio-mmio.c | 17 +----- hw/virtio/virtio-pci.c | 3 -- include/hw/hotplug.h | 16 +++++- include/hw/pci/pcie.h | 4 +- include/hw/pci/shpc.h | 4 +- include/hw/qdev-core.h | 19 +++---- include/hw/scsi/scsi.h | 2 - include/qom/object.h | 14 +++++ qapi-schema.json | 4 +- qdev-monitor.c | 25 ++++++--- qmp.c | 13 +++-- qom/object.c | 41 ++++++++++++-- target-ppc/translate_init.c | 2 +- tests/Makefile | 13 ++--- tests/libqos/pci-pc.c | 49 +++++++++++++++++ tests/libqos/pci.h | 3 ++ tests/libqos/usb.c | 71 ++++++++++++++++++++++++ tests/libqos/usb.h | 17 ++++++ tests/usb-hcd-ehci-test.c | 50 +++++++---------- tests/usb-hcd-ohci-test.c | 10 +++- tests/usb-hcd-uhci-test.c | 65 +++++++++++++++++++++- tests/usb-hcd-xhci-test.c | 68 ++++++++++++++++++++++- tests/virtio-blk-test.c | 49 +++++++++++++---- tests/virtio-net-test.c | 10 ++++ tests/virtio-rng-test.c | 10 ++++ tests/virtio-scsi-test.c | 29 ++++++++++ tests/virtio-serial-test.c | 27 ++++++++++ 50 files changed, 744 insertions(+), 225 deletions(-) create mode 100644 tests/libqos/usb.c create mode 100644 tests/libqos/usb.h