[v3,8/9] convert code to qdev_new_dynamic() where appropriate

Message ID	20241115172521.504102-9-berrange@redhat.com (mailing list archive)
State	New
Headers	show Return-Path: <qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org> From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com> To: qemu-devel@nongnu.org Cc: Paolo Bonzini <pbonzini@redhat.com>, Peter Xu <peterx@redhat.com>, Markus Armbruster <armbru@redhat.com>, =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com> Subject: [PATCH v3 8/9] convert code to qdev_new_dynamic() where appropriate Date: Fri, 15 Nov 2024 17:25:20 +0000 Message-ID: <20241115172521.504102-9-berrange@redhat.com> In-Reply-To: <20241115172521.504102-1-berrange@redhat.com> References: <20241115172521.504102-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.12, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org
Series	Require error handling for dynamically created objects \| expand [v3,0/9] Require error handling for dynamically created objects [v3,1/9] hw: eliminate qdev_try_new, isa_try_new & usb_try_new [v3,2/9] qom: refactor checking abstract property when creating instances [v3,3/9] qom: allow failure of object_new_with_class [v3,4/9] qom: introduce object_new_dynamic() [v3,5/9] convert code to object_new_dynamic() where appropriate [v3,6/9] qom: enforce use of static, const string with object_new() [v3,7/9] qom: introduce qdev_new_dynamic() [v3,8/9] convert code to qdev_new_dynamic() where appropriate [v3,9/9] hw: enforce use of static, const string with qdev_new()

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 71196b0a4b..19dbcee64a 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -320,7 +320,7 @@ void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype, DriveInfo *dinfo = drive_get(IF_MTD, 0, unit0 + i); DeviceState *dev; - dev = qdev_new(flashtype); + dev = qdev_new_dynamic(flashtype, &error_fatal); if (dinfo) { qdev_prop_set_drive(dev, "drive", blk_by_legacy_dinfo(dinfo)); } diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index e229efb447..098beeab63 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -83,7 +83,7 @@ static void npcm7xx_connect_flash(NPCM7xxFIUState *fiu, int cs_no, DeviceState *flash; qemu_irq flash_cs; - flash = qdev_new(flash_type); + flash = qdev_new_dynamic(flash_type, &error_fatal); if (dinfo) { qdev_prop_set_drive(flash, "drive", blk_by_legacy_dinfo(dinfo)); } diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index a0006c9af0..12e0a70981 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -419,7 +419,7 @@ static void create_its(SBSAMachineState *sms) const char *itsclass = its_class_name(); DeviceState *dev; - dev = qdev_new(itsclass); + dev = qdev_new_dynamic(itsclass, &error_fatal); object_property_set_link(OBJECT(dev), "parent-gicv3", OBJECT(sms->gic), &error_abort); @@ -438,7 +438,7 @@ static void create_gic(SBSAMachineState *sms, MemoryRegion *mem) gictype = gicv3_class_name(); - sms->gic = qdev_new(gictype); + sms->gic = qdev_new_dynamic(gictype, &error_fatal); qdev_prop_set_uint32(sms->gic, "revision", 3); qdev_prop_set_uint32(sms->gic, "num-cpu", smp_cpus); /* diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 98ad6299a8..e13c66b838 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -239,7 +239,7 @@ static void init_cpus(MachineState *ms, const char *cpu_type, * this must happen after the CPUs are created because a15mpcore_priv * wires itself up to the CPU's generic_timer gpio out lines. */ - dev = qdev_new(privdev); + dev = qdev_new_dynamic(privdev, &error_fatal); qdev_prop_set_uint32(dev, "num-cpu", smp_cpus); busdev = SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(busdev, &error_fatal); diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f80ab50d41..57b1735380 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -715,7 +715,7 @@ static void create_its(VirtMachineState *vms) return; } - dev = qdev_new(itsclass); + dev = qdev_new_dynamic(itsclass, &error_fatal); object_property_set_link(OBJECT(dev), "parent-gicv3", OBJECT(vms->gic), &error_abort); @@ -791,7 +791,7 @@ static void create_gic(VirtMachineState *vms, MemoryRegion *mem) default: g_assert_not_reached(); } - vms->gic = qdev_new(gictype); + vms->gic = qdev_new_dynamic(gictype, &error_fatal); qdev_prop_set_uint32(vms->gic, "revision", revision); qdev_prop_set_uint32(vms->gic, "num-cpu", smp_cpus); /* Note that the num-irq property counts both internal and external diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c index d18fd9fa05..17ed3a8084 100644 --- a/hw/audio/soundhw.c +++ b/hw/audio/soundhw.c @@ -132,7 +132,7 @@ void soundhw_init(void) } if (c->typename) { - DeviceState *dev = qdev_new(c->typename); + DeviceState *dev = qdev_new_dynamic(c->typename, &error_fatal); qdev_prop_set_string(dev, "audiodev", audiodev_id); qdev_realize_and_unref(dev, bus, &error_fatal); } else { diff --git a/hw/block/xen-block.c b/hw/block/xen-block.c index aed1d5c330..fd5fa7b6e7 100644 --- a/hw/block/xen-block.c +++ b/hw/block/xen-block.c @@ -1034,6 +1034,7 @@ static void xen_block_device_create(XenBackendInstance *backend, XenDevice *xendev = NULL; const char *type; XenBlockDevice *blockdev; + DeviceState *dev; if (qemu_strtoul(name, NULL, 10, &number)) { error_setg(errp, "failed to parse name '%s'", name); @@ -1075,7 +1076,11 @@ static void xen_block_device_create(XenBackendInstance *backend, goto fail; } - xendev = XEN_DEVICE(qdev_new(type)); + dev = qdev_new_dynamic(type, errp); + if (!dev) { + goto fail; + } + xendev = XEN_DEVICE(dev); blockdev = XEN_BLOCK_DEVICE(xendev); if (!object_property_set_str(OBJECT(xendev), "vdev", vdev, diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index e64d99c8ed..e472a969f1 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -221,7 +221,7 @@ DeviceState *sysbus_create_varargs(const char *name, qemu_irq irq; int n; - dev = qdev_new(name); + dev = qdev_new_dynamic(name, &error_fatal); s = SYS_BUS_DEVICE(dev); sysbus_realize_and_unref(s, &error_fatal); if (addr != (hwaddr)-1) { diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 4cf30b2c86..a430f4e767 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -369,7 +369,7 @@ I2CSlave *i2c_slave_new(const char *name, uint8_t addr) { DeviceState *dev; - dev = qdev_new(name); + dev = qdev_new_dynamic(name, &error_fatal); qdev_prop_set_uint8(dev, "address", addr); return I2C_SLAVE(dev); } diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c index 8aaf44a3ef..34330547cb 100644 --- a/hw/isa/isa-bus.c +++ b/hw/isa/isa-bus.c @@ -155,7 +155,7 @@ int isa_register_portio_list(ISADevice *dev, ISADevice *isa_new(const char *name) { - return ISA_DEVICE(qdev_new(name)); + return ISA_DEVICE(qdev_new_dynamic(name, &error_fatal)); } ISADevice *isa_create_simple(ISABus *bus, const char *name) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 1416ae202c..51338320c1 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -2186,7 +2186,7 @@ static PCIDevice *pci_new_internal(int devfn, bool multifunction, { DeviceState *dev; - dev = qdev_new(name); + dev = qdev_new_dynamic(name, &error_fatal); qdev_prop_set_int32(dev, "addr", devfn); qdev_prop_set_bit(dev, "multifunction", multifunction); return PCI_DEVICE(dev); diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 75420c9413..e81c562967 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1115,7 +1115,7 @@ static void pnv_init(MachineState *machine) pnv->chips = g_new0(PnvChip *, pnv->num_chips); for (i = 0; i < pnv->num_chips; i++) { char chip_name[32]; - Object *chip = OBJECT(qdev_new(chip_typename)); + Object *chip = OBJECT(qdev_new_dynamic(chip_typename, &error_fatal)); uint64_t chip_ram_size = pnv_chip_get_ram_size(pnv, i); pnv->chips[i] = PNV_CHIP(chip); diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 5441dc4c32..b276b5e77f 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -242,7 +242,7 @@ static void s390_create_sclpconsole(SCLPDevice *sclp, BusState *ev_fac_bus = sclp_get_event_facility_bus(ef); DeviceState *dev; - dev = qdev_new(type); + dev = qdev_new_dynamic(type, &error_fatal); object_property_add_child(OBJECT(ef), type, OBJECT(dev)); qdev_prop_set_chr(dev, "chardev", chardev); qdev_realize_and_unref(dev, ev_fac_bus, &error_fatal); diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c index 53eff5dd3d..23be8ebca4 100644 --- a/hw/scsi/scsi-bus.c +++ b/hw/scsi/scsi-bus.c @@ -396,7 +396,10 @@ SCSIDevice *scsi_bus_legacy_add_drive(SCSIBus *bus, BlockBackend *blk, driver = "scsi-hd"; } } - dev = qdev_new(driver); + dev = qdev_new_dynamic(driver, errp); + if (!dev) { + return NULL; + } name = g_strdup_printf("legacy[%d]", unit); object_property_add_child(OBJECT(bus), name, OBJECT(dev)); g_free(name); diff --git a/hw/ssi/ssi.c b/hw/ssi/ssi.c index 3f357e8f16..712bb1781c 100644 --- a/hw/ssi/ssi.c +++ b/hw/ssi/ssi.c @@ -141,7 +141,7 @@ bool ssi_realize_and_unref(DeviceState *dev, SSIBus *bus, Error **errp) DeviceState *ssi_create_peripheral(SSIBus *bus, const char *name) { - DeviceState *dev = qdev_new(name); + DeviceState *dev = qdev_new_dynamic(name, &error_fatal); ssi_realize_and_unref(dev, bus, &error_fatal); return dev; diff --git a/include/hw/usb.h b/include/hw/usb.h index bb778cb844..bb90098d39 100644 --- a/include/hw/usb.h +++ b/include/hw/usb.h @@ -581,7 +581,7 @@ void usb_pcap_data(USBPacket *p, bool setup); static inline USBDevice *usb_new(const char *name) { - return USB_DEVICE(qdev_new(name)); + return USB_DEVICE(qdev_new_dynamic(name, &error_fatal)); } static inline bool usb_realize_and_unref(USBDevice *dev, USBBus *bus, Error **errp) diff --git a/include/qom/object.h b/include/qom/object.h index 2d5a0d84b5..4e660da84a 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -654,7 +654,7 @@ Object *object_new_internal(const char *typename); * @typename: The name of the type of the object to instantiate. * @errp: pointer to be filled with error details on failure * - * This method should be used where @typename is dynamically chosen + * This method must be used where @typename is dynamically chosen * at runtime, which has the possibility of unexpected choices leading * to failures. * @@ -663,7 +663,7 @@ Object *object_new_internal(const char *typename); * the last reference is dropped. * * If an instance of @typename is not permitted to be instantiated, an - * error will be raised. This can happen if @typename is abstract. + * error will be reported. This can happen if @typename is abstract. * * Returns: The newly allocated and instantiated object. */ diff --git a/net/net.c b/net/net.c index fbbfe602a4..fa89ec8e03 100644 --- a/net/net.c +++ b/net/net.c @@ -1175,7 +1175,7 @@ DeviceState *qemu_create_nic_device(const char *typename, bool match_default, return NULL; } - dev = qdev_new(typename); + dev = qdev_new_dynamic(typename, &error_fatal); qdev_set_nic_properties(dev, nd); return dev; } @@ -1225,7 +1225,7 @@ void qemu_create_nic_bus_devices(BusState *bus, const char *parent_type, continue; } - dev = qdev_new(model); + dev = qdev_new_dynamic(model, &error_fatal); qdev_set_nic_properties(dev, nd); qdev_realize_and_unref(dev, bus, &error_fatal); } diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 4c09b38ffb..3138192cf8 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -686,7 +686,10 @@ DeviceState *qdev_device_add_from_qdict(const QDict *opts, } /* create device */ - dev = qdev_new(driver); + dev = qdev_new_dynamic(driver, errp); + if (!dev) { + return NULL; + } /* Check whether the hotplug is allowed by the machine */ if (phase_check(PHASE_MACHINE_READY)) {

[v3,8/9] convert code to qdev_new_dynamic() where appropriate

Commit Message

Patch