Skip to content

complete conversion to hotplug-handler API

Igor Mammedov qemu-devel 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest36 patches 33 repliesIn review
  2. v130 patches 67 repliesSuperseded

Changes in v2 from the cover letter

* added usb-uas test
* drop hotplug check in bus_add_child()
* make SCSI & USB bus as default HotplugHandler
* fixed dummy HBA hot(un)plug
* fixed hotunplug on s390x
* prevent hotplug of non hotpluggable devices
--

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/36test: virtio-scsi: check if hot-plug/unplug workstests/virtio-scsi-test.c+29 -00 replies
2/36test: virtio-serial: check if hot-plug/unplug workstests/virtio-serial-test.c+27 -00 replies
3/36test: libqos: add qpci_plug_device_test() and qpci_unplug_acpi_device_test()tests/libqos/pci-pc.c tests/libqos/pci.h+52 -00 replies
4/36test: virtio-rng: check if hot-plug/unplug workstests/Makefile tests/virtio-rng-test.c+11 -10 replies
5/36test: virtio-net: check if hot-plug/unplug workstests/Makefile tests/virtio-net-test.c+11 -10 replies
6/36test: virtio-blk: check if hot-plug/unplug workstests/virtio-blk-test.c+38 -110 replies
7/36test: usb: move uhci port test code to libqos/usb.ctests/Makefile tests/libqos/usb.c tests/libqos/usb.h +1 more+58 -320 replies
8/36test: usb: add port test to uhci unit testtests/Makefile tests/usb-hcd-uhci-test.c+17 -30 replies
9/36test: usb: generic usb device hotplugtests/Makefile tests/libqos/usb.c tests/libqos/usb.h +4 more+87 -90 replies
10/36test: usb: usb-storage hotplug testtests/usb-hcd-uhci-test.c+31 -00 replies
11/36test: usb: usb-uas hotplug testtests/usb-hcd-xhci-test.c+60 -10 replies
12/36access BusState.allow_hotplug using wraper qbus_is_hotpluggable()hw/core/qdev.c hw/i386/acpi-build.c hw/pci/pci-hotplug-old.c +2 more+12 -70 replies
13/36qdev: do not allow to instantiate non hotpluggable device with device_addqdev-monitor.c+2 -11 reply
14/36qdev: HotplugHandler: rename unplug callback to unplug_requesthw/acpi/piix4.c hw/core/hotplug.c hw/core/qdev.c +8 more+32 -291 reply
15/36qdev: HotplugHandler: provide unplug callbackhw/core/hotplug.c hw/core/qdev.c include/hw/hotplug.h+34 -20 replies
16/36qdev: add simple/generic unplug callback for HotplugHandlerhw/core/qdev.c include/hw/qdev-core.h+7 -00 replies
17/36qdev: add wrapper to set BUS as HotplugHandlerhw/core/qdev.c include/hw/qdev-core.h+23 -71 reply
18/36qdev: drop hotplug check from bus_add_child()hw/core/qdev.c+0 -41 reply
19/36target-i386: ICC bus: drop BusState.allow_hotplughw/cpu/icc_bus.c+0 -81 reply
20/36virtio-pci: drop BusState.allow_hotplughw/virtio/virtio-pci.c+0 -30 replies
21/36virtio-serial: convert to hotplug-handler APIhw/char/virtio-serial-bus.c+15 -50 replies
22/36virtio-mmio: drop useless bus->allow_hotplug = 0hw/virtio/virtio-mmio.c+2 -150 replies
23/36s390x: drop not used allow_hotplug in event-facilityhw/s390x/event-facility.c+0 -21 reply
24/36s390x: convert s390-virtio to hotplug handler APIhw/s390x/s390-virtio-bus.c+7 -58 replies
25/36s390x: convert virtio-ccw to hotplug handler APIhw/s390x/virtio-ccw.c+9 -81 reply
26/36scsi: set SCSI BUS itself as default HotplugHandlerhw/scsi/scsi-bus.c+7 -10 replies
27/36scsi: convert pvscsi HBA to hotplug handler APIhw/scsi/vmw_pvscsi.c+18 -80 replies
28/36scsi: convert virtio-scsi HBA to hotplug handler APIhw/scsi/virtio-scsi.c+20 -100 replies
29/36scsi: cleanup not used anymore SCSIBusInfo{hotplug, hot_unplug} fieldshw/scsi/scsi-bus.c include/hw/scsi/scsi.h+0 -180 replies
30/36usb-bot: mark device as non hotpluggablehw/usb/dev-storage.c+2 -00 replies
31/36usb-bot: drop not needed "allow_hotplug = 0"hw/usb/dev-storage.c+0 -10 replies
32/36usb-storage: drop not needed "allow_hotplug = 0"hw/usb/dev-storage.c+0 -10 replies
33/36usb: convert usb-ccid to hotplug handler APIhw/usb/dev-smartcard-reader.c+7 -10 replies
34/36usb: convert usb devices to hotplug handler APIhw/usb/bus.c+7 -20 replies
35/36qdev: drop legacy hotplug fields/methodshw/core/qdev.c include/hw/qdev-core.h+4 -170 replies
36/36qdev: HotplugHandler: add support for unplugging BUS-less deviceshw/core/qdev.c+34 -276 replies

Reviews trailers per patch

18 of 36 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchPaolo BonziniCornelia HuckMichael S. Tsirkin
SeriesR-b R-b
1/36R-b
2/36R-b
3/36
4/36
5/36
6/36
7/36
8/36
9/36
10/36
11/36
12/36R-b
13/36R-b
14/36R-b R-b
15/36R-b
16/36R-b
17/36R-b
18/36R-b
19/36R-b
20/36
21/36R-b
22/36R-b
23/36R-b R-b
24/36R-b
25/36R-b
26/36
27/36
28/36
29/36R-b
30/36
31/36
32/36R-b
33/36
34/36
35/36R-b
36/36

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v2 thread

Cover letter [Qemu-devel] [PATCH v2 00/36] complete conversion to hotplug-handler API

Changes since v1:
* added usb-uas test
* drop hotplug check in bus_add_child()
* make SCSI & USB bus as default HotplugHandler
* fixed dummy HBA hot(un)plug
* fixed hotunplug on s390x
* prevent hotplug of non hotpluggable devices
--

Series unifies different hotplug mechanisms to a recent hotplug-handler API and does shallow conversion of devices that still use legacy qdev hotplug to it dropping not used after that legacy hotplug path [29/30]. It also relaces SCSI's own way to do hotplug/unplug with hotplug-handler callbacks leaving it the only method perform hotplug tasks.
And the last patch [30/30] allows to unplug of BUS-less devices using hotplug-handler API.

Converted devices are covered with new hotplug unit-tests, except of:
s390x-*: I have no idea how or means to test it, but code
is close to virtio, so it's converted using virtio template
pvscsi: is broken, so no means to test it

Git tree for testing:
https://github.com/imammedo/qemu/commits/hp_ctrl_conversion_v2

Igor Mammedov (36):
test: virtio-scsi: check if hot-plug/unplug works
test: virtio-serial: check if hot-plug/unplug works
test: libqos: add qpci_plug_device_test() and
qpci_unplug_acpi_device_test()
test: virtio-rng: check if hot-plug/unplug works
test: virtio-net: check if hot-plug/unplug works
test: virtio-blk: check if hot-plug/unplug works
test: usb: move uhci port test code to libqos/usb.c
test: usb: add port test to uhci unit test
test: usb: generic usb device hotplug
test: usb: usb-storage hotplug test
test: 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

 hw/acpi/piix4.c                |  6 +--
 hw/char/virtio-serial-bus.c    | 20 +++++++---
 hw/core/hotplug.c              | 11 ++++++
 hw/core/qdev.c                 | 85 ++++++++++++++++++++++++++++--------------
 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     | 12 +++---
 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         | 17 +++++----
 include/hw/scsi/scsi.h         |  2 -
 qdev-monitor.c                 |  5 ++-
 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 ++++++++++++++
 43 files changed, 624 insertions(+), 201 deletions(-)
 create mode 100644 tests/libqos/usb.c
 create mode 100644 tests/libqos/usb.h
Signature · 1 line
1.8.3.1