mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 09:43:56 -06:00
qdev: Drop qbus_set_hotplug_handler() parameter @errp
qbus_set_hotplug_handler() is a simple wrapper around object_property_set_link(). object_property_set_link() fails when the property doesn't exist, is not settable, or its .check() method fails. These are all programming errors here, so passing &error_abort to qbus_set_hotplug_handler() is appropriate. Most of its callers do. Exceptions: * pcie_cap_slot_init(), shpc_init(), spapr_phb_realize() pass NULL, i.e. they ignore errors. * spapr_machine_init() passes &error_fatal. * s390_pcihost_realize(), virtio_serial_device_realize(), s390_pcihost_plug() pass the error to their callers. The latter two keep going after the error, which looks wrong. Drop the @errp parameter, and instead pass &error_abort to object_property_set_link(). Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: "Daniel P. Berrangé" <berrange@redhat.com> Cc: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20200630090351.1247703-15-armbru@redhat.com>
This commit is contained in:
parent
cd7c866074
commit
9bc6bfdf67
15 changed files with 22 additions and 33 deletions
|
@ -1056,7 +1056,7 @@ static void virtio_serial_device_realize(DeviceState *dev, Error **errp)
|
|||
/* Spawn a new virtio-serial bus on which the ports will ride as devices */
|
||||
qbus_create_inplace(&vser->bus, sizeof(vser->bus), TYPE_VIRTIO_SERIAL_BUS,
|
||||
dev, vdev->bus_name);
|
||||
qbus_set_hotplug_handler(BUS(&vser->bus), OBJECT(vser), errp);
|
||||
qbus_set_hotplug_handler(BUS(&vser->bus), OBJECT(vser));
|
||||
vser->bus.vser = vser;
|
||||
QTAILQ_INIT(&vser->ports);
|
||||
|
||||
|
@ -1147,7 +1147,7 @@ static void virtio_serial_device_unrealize(DeviceState *dev)
|
|||
g_free(vser->post_load);
|
||||
}
|
||||
|
||||
qbus_set_hotplug_handler(BUS(&vser->bus), NULL, &error_abort);
|
||||
qbus_set_hotplug_handler(BUS(&vser->bus), NULL);
|
||||
|
||||
virtio_cleanup(vdev);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue