Devices may have component devices and buses.
Device realization may fail. Realization is recursive: a device's
realize() method realizes its components, and device_set_realized()
realizes its buses (which should in turn realize the devices on that
bus, except bus_set_realized() doesn't implement that, yet).
When realization of a component or bus fails, we need to roll back:
unrealize everything we realized so far. If any of these unrealizes
failed, the device would be left in an inconsistent state. Must not
happen.
device_set_realized() lets it happen: it ignores errors in the roll
back code starting at label child_realize_fail.
Since realization is recursive, unrealization must be recursive, too.
But how could a partly failed unrealize be rolled back? We'd have to
re-realize, which can fail. This design is fundamentally broken.
device_set_realized() does not roll back at all. Instead, it keeps
unrealizing, ignoring further errors.
It can screw up even for a device with no buses: if the lone
dc->unrealize() fails, it still unregisters vmstate, and calls
listeners' unrealize() callback.
bus_set_realized() does not roll back either. Instead, it stops
unrealizing.
Fortunately, no unrealize method can fail, as we'll see below.
To fix the design error, drop parameter @errp from all the unrealize
methods.
Any unrealize method that uses @errp now needs an update. This leads
us to unrealize() methods that can fail. Merely passing it to another
unrealize method cannot cause failure, though. Here are the ones that
do other things with @errp:
* virtio_serial_device_unrealize()
Fails when qbus_set_hotplug_handler() fails, but still does all the
other work. On failure, the device would stay realized with its
resources completely gone. Oops. Can't happen, because
qbus_set_hotplug_handler() can't actually fail here. Pass
&error_abort to qbus_set_hotplug_handler() instead.
* hw/ppc/spapr_drc.c's unrealize()
Fails when object_property_del() fails, but all the other work is
already done. On failure, the device would stay realized with its
vmstate registration gone. Oops. Can't happen, because
object_property_del() can't actually fail here. Pass &error_abort
to object_property_del() instead.
* spapr_phb_unrealize()
Fails and bails out when remove_drcs() fails, but other work is
already done. On failure, the device would stay realized with some
of its resources gone. Oops. remove_drcs() fails only when
chassis_from_bus()'s object_property_get_uint() fails, and it can't
here. Pass &error_abort to remove_drcs() instead.
Therefore, no unrealize method can fail before this patch.
device_set_realized()'s recursive unrealization via bus uses
object_property_set_bool(). Can't drop @errp there, so pass
&error_abort.
We similarly unrealize with object_property_set_bool() elsewhere,
always ignoring errors. Pass &error_abort instead.
Several unrealize methods no longer handle errors from other unrealize
methods: virtio_9p_device_unrealize(),
virtio_input_device_unrealize(), scsi_qdev_unrealize(), ...
Much of the deleted error handling looks wrong anyway.
One unrealize methods no longer ignore such errors:
usb_ehci_pci_exit().
Several realize methods no longer ignore errors when rolling back:
v9fs_device_realize_common(), pci_qdev_unrealize(),
spapr_phb_realize(), usb_qdev_realize(), vfio_ccw_realize(),
virtio_device_realize().
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/9pfs/9p.h | 2 +-
hw/s390x/virtio-ccw.h | 2 +-
hw/sd/sdhci-internal.h | 2 +-
hw/usb/ccid.h | 2 +-
hw/usb/hcd-ehci.h | 2 +-
include/hw/qdev-core.h | 4 ++--
include/hw/s390x/s390-ccw.h | 2 +-
include/hw/scsi/scsi.h | 2 +-
include/hw/usb.h | 2 +-
include/hw/xen/xen-block.h | 2 +-
include/hw/xen/xen-bus.h | 2 +-
hw/9pfs/9p.c | 4 ++--
hw/9pfs/virtio-9p-device.c | 4 ++--
hw/acpi/pcihp.c | 2 +-
hw/audio/intel-hda.c | 2 +-
hw/block/pflash_cfi02.c | 2 +-
hw/block/vhost-user-blk.c | 2 +-
hw/block/virtio-blk.c | 2 +-
hw/block/xen-block.c | 8 ++++----
hw/char/serial-pci-multi.c | 2 +-
hw/char/serial-pci.c | 2 +-
hw/char/serial.c | 2 +-
hw/char/virtio-console.c | 2 +-
hw/char/virtio-serial-bus.c | 8 ++++----
hw/core/bus.c | 17 ++++-------------
hw/core/cpu.c | 2 +-
hw/core/generic-loader.c | 2 +-
hw/core/qdev.c | 17 ++++++-----------
hw/display/virtio-gpu-base.c | 2 +-
hw/dma/rc4030.c | 2 +-
hw/i386/kvm/apic.c | 2 +-
hw/i386/pc.c | 4 ++--
hw/ide/qdev.c | 4 ++--
hw/input/virtio-input-hid.c | 2 +-
hw/input/virtio-input-host.c | 2 +-
hw/input/virtio-input.c | 9 ++-------
hw/intc/apic.c | 2 +-
hw/intc/apic_common.c | 4 ++--
hw/intc/ioapic.c | 2 +-
hw/intc/xics.c | 2 +-
hw/ipack/ipack.c | 6 ++----
hw/mem/pc-dimm.c | 2 +-
hw/net/virtio-net.c | 2 +-
hw/nvram/mac_nvram.c | 2 +-
hw/pci/pci.c | 14 +++++++-------
hw/pci/pcie.c | 2 +-
hw/pci/shpc.c | 2 +-
hw/ppc/pnv_core.c | 2 +-
hw/ppc/spapr.c | 8 ++++----
hw/ppc/spapr_cpu_core.c | 2 +-
hw/ppc/spapr_drc.c | 14 ++++----------
hw/ppc/spapr_iommu.c | 2 +-
hw/ppc/spapr_pci.c | 14 +++++---------
hw/ppc/spapr_tpm_proxy.c | 2 +-
hw/s390x/css-bridge.c | 2 +-
hw/s390x/s390-ccw.c | 2 +-
hw/s390x/s390-pci-bus.c | 4 ++--
hw/s390x/virtio-ccw.c | 8 ++++----
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/scsi-bus.c | 13 ++++---------
hw/scsi/scsi-disk.c | 2 +-
hw/scsi/vhost-scsi.c | 2 +-
hw/scsi/vhost-user-scsi.c | 2 +-
hw/scsi/virtio-scsi.c | 2 +-
hw/sd/sdhci-pci.c | 2 +-
hw/sd/sdhci.c | 6 +++---
hw/usb/bus.c | 12 ++++++------
hw/usb/ccid-card-emulated.c | 2 +-
hw/usb/dev-audio.c | 2 +-
hw/usb/dev-hid.c | 2 +-
hw/usb/dev-hub.c | 2 +-
hw/usb/dev-network.c | 2 +-
hw/usb/dev-smartcard-reader.c | 11 +++--------
hw/usb/dev-uas.c | 2 +-
hw/usb/dev-wacom.c | 2 +-
hw/usb/hcd-ehci-pci.c | 2 +-
hw/usb/hcd-ehci.c | 2 +-
hw/usb/host-libusb.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/vfio/ap.c | 2 +-
hw/vfio/ccw.c | 6 +++---
hw/virtio/vhost-user-fs.c | 2 +-
hw/virtio/vhost-vsock.c | 2 +-
hw/virtio/virtio-balloon.c | 2 +-
hw/virtio/virtio-crypto.c | 2 +-
hw/virtio/virtio-iommu.c | 2 +-
hw/virtio/virtio-pmem.c | 2 +-
hw/virtio/virtio-rng.c | 2 +-
hw/virtio/virtio.c | 11 +++--------
hw/watchdog/wdt_diag288.c | 2 +-
hw/xen/xen-bus.c | 12 ++++++------
target/i386/cpu.c | 9 ++-------
target/ppc/translate_init.inc.c | 9 ++-------
93 files changed, 158 insertions(+), 214 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index b6c8ef5bc0..850fcce5e7 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -3622,7 +3622,7 @@ static void virtio_device_realize(DeviceState *dev, Error
**errp)
virtio_bus_device_plugged(vdev, &err);
if (err != NULL) {
error_propagate(errp, err);
- vdc->unrealize(dev, NULL);
+ vdc->unrealize(dev);
return;
}
@@ -3630,20 +3630,15 @@ static void virtio_device_realize(DeviceState *dev, Error **errp)
memory_listener_register(&vdev->listener, vdev->dma_as);
}
-static void virtio_device_unrealize(DeviceState *dev, Error **errp)
+static void virtio_device_unrealize(DeviceState *dev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_GET_CLASS(dev);
- Error *err = NULL;
virtio_bus_device_unplugged(vdev);
if (vdc->unrealize != NULL) {