From: Peter Maydell Date: Wed, 15 Oct 2014 07:12:53 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=88e6599669a2f8c9ec5b8baa62178bc3dfc340ae;p=qemu.git Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging QOM infrastructure fixes and device conversions * GPIO conversion to QOM, continued * Device property description support * QTest cases for hotplug * Hotplug handler conversion # gpg: Signature made Wed 15 Oct 2014 04:05:17 BST using RSA key ID 3E7E013F # gpg: Good signature from "Andreas Färber " # gpg: aka "Andreas Färber " * remotes/afaerber/tags/qom-devices-for-peter: (47 commits) qdev: Drop legacy_name from qdev properties qmp: Print descriptions of object properties qdev: Set the object property's description to the qdev property's. qom: Add description field in ObjectProperty struct qdev: Add description field in PropertyInfo struct qdev: device_del: Search for to be unplugged device in 'peripheral' container qdev: HotplugHandler: Add support for unplugging BUS-less devices qdev: Drop legacy hotplug fields/methods usb: Convert usb devices to hotplug handler API usb: Convert usb-ccid to hotplug handler API usb-storage: Drop not needed "allow_hotplug = 0" usb-bot: Drop not needed "allow_hotplug = 0" usb-bot: Mark device as non hotpluggable scsi: Cleanup not used anymore SCSIBusInfo{hotplug, hot_unplug} fields scsi: Convert virtio-scsi HBA to hotplug handler API scsi: Convert pvscsi HBA to hotplug handler API scsi: Set SCSI BUS itself as default HotplugHandler s390x: Convert virtio-ccw to hotplug handler API s390x: Convert s390-virtio to hotplug handler API s390x: Drop not used allow_hotplug in event-facility ... Signed-off-by: Peter Maydell --- 88e6599669a2f8c9ec5b8baa62178bc3dfc340ae