[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 46/84] isa: Convert uses of isa_create(), isa_try_create() manuall
From: |
Markus Armbruster |
Subject: |
[PULL 46/84] isa: Convert uses of isa_create(), isa_try_create() manually |
Date: |
Mon, 15 Jun 2020 22:39:30 +0200 |
Same transformation as in the previous commit. Manual, because
convincing Coccinelle to transform these cases is not worthwhile.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-21-armbru@redhat.com>
---
include/hw/net/ne2000-isa.h | 5 +++--
hw/block/fdc.c | 4 ++--
hw/i386/pc.c | 4 ++--
hw/ppc/pnv.c | 9 ++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/hw/net/ne2000-isa.h b/include/hw/net/ne2000-isa.h
index eef17a680d..af59ee0b02 100644
--- a/include/hw/net/ne2000-isa.h
+++ b/include/hw/net/ne2000-isa.h
@@ -13,6 +13,7 @@
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
#include "net/net.h"
+#include "qapi/error.h"
#define TYPE_ISA_NE2000 "ne2k_isa"
@@ -23,14 +24,14 @@ static inline ISADevice *isa_ne2000_init(ISABus *bus, int
base, int irq,
qemu_check_nic_model(nd, "ne2k_isa");
- d = isa_try_create(bus, TYPE_ISA_NE2000);
+ d = isa_try_new(TYPE_ISA_NE2000);
if (d) {
DeviceState *dev = DEVICE(d);
qdev_prop_set_uint32(dev, "iobase", base);
qdev_prop_set_uint32(dev, "irq", irq);
qdev_set_nic_properties(dev, nd);
- qdev_init_nofail(dev);
+ isa_realize_and_unref(d, bus, &error_fatal);
}
return d;
}
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index 1feb398875..a3250f6fdb 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -2544,7 +2544,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds)
DeviceState *dev;
ISADevice *isadev;
- isadev = isa_try_create(bus, TYPE_ISA_FDC);
+ isadev = isa_try_new(TYPE_ISA_FDC);
if (!isadev) {
return NULL;
}
@@ -2558,7 +2558,7 @@ ISADevice *fdctrl_init_isa(ISABus *bus, DriveInfo **fds)
qdev_prop_set_drive(dev, "driveB", blk_by_legacy_dinfo(fds[1]),
&error_fatal);
}
- qdev_init_nofail(dev);
+ isa_realize_and_unref(isadev, bus, &error_fatal);
return isadev;
}
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ab2380c01f..30a2b5eb30 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1158,14 +1158,14 @@ static void pc_superio_init(ISABus *isa_bus, bool
create_fdctrl, bool no_vmport)
i8042 = isa_create_simple(isa_bus, "i8042");
if (!no_vmport) {
isa_create_simple(isa_bus, TYPE_VMPORT);
- vmmouse = isa_try_create(isa_bus, "vmmouse");
+ vmmouse = isa_try_new("vmmouse");
} else {
vmmouse = NULL;
}
if (vmmouse) {
object_property_set_link(OBJECT(vmmouse), OBJECT(i8042),
"i8042", &error_abort);
- qdev_init_nofail(DEVICE(vmmouse));
+ isa_realize_and_unref(vmmouse, isa_bus, &error_fatal);
}
port92 = isa_create_simple(isa_bus, TYPE_PORT92);
diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index e0588285a2..ffaf12b006 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -694,12 +694,11 @@ static bool pnv_match_cpu(const char *default_type, const
char *cpu_type)
static void pnv_ipmi_bt_init(ISABus *bus, IPMIBmc *bmc, uint32_t irq)
{
- Object *obj;
+ ISADevice *dev = isa_new("isa-ipmi-bt");
- obj = OBJECT(isa_create(bus, "isa-ipmi-bt"));
- object_property_set_link(obj, OBJECT(bmc), "bmc", &error_fatal);
- object_property_set_int(obj, irq, "irq", &error_fatal);
- object_property_set_bool(obj, true, "realized", &error_fatal);
+ object_property_set_link(OBJECT(dev), OBJECT(bmc), "bmc", &error_fatal);
+ object_property_set_int(OBJECT(dev), irq, "irq", &error_fatal);
+ isa_realize_and_unref(dev, bus, &error_fatal);
}
static void pnv_chip_power10_pic_print_info(PnvChip *chip, Monitor *mon)
--
2.26.2
- [PULL 20/84] display/sm501 display/ati: Fix to realize "i2c-ddc", (continued)
- [PULL 20/84] display/sm501 display/ati: Fix to realize "i2c-ddc", Markus Armbruster, 2020/06/15
- [PULL 33/84] qdev: Convert to qdev_unrealize() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 25/84] sd: Hide the qdev-but-not-quite thing created by sd_init(), Markus Armbruster, 2020/06/15
- [PULL 18/84] ppc/pnv: Put "*-pnv-chip" and "pnv-xive" on the main system bus, Markus Armbruster, 2020/06/15
- [PULL 37/84] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 30/84] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/06/15
- [PULL 29/84] Revert "hw/versatile: realize the PCI root bus as part of the versatile init", Markus Armbruster, 2020/06/15
- [PULL 26/84] qdev: Assert onboard devices all get realized properly, Markus Armbruster, 2020/06/15
- [PULL 40/84] hw/ppc: Eliminate two superfluous QOM casts, Markus Armbruster, 2020/06/15
- [PULL 23/84] sparc/leon3: Fix to put grlib,* devices on sysbus, Markus Armbruster, 2020/06/15
- [PULL 46/84] isa: Convert uses of isa_create(), isa_try_create() manually,
Markus Armbruster <=
- [PULL 41/84] pci: Convert uses of pci_create() etc. with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 47/84] isa: isa_create(), isa_try_create() are now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 51/84] ssi: ssi_create_slave_no_init() is now unused, drop, Markus Armbruster, 2020/06/15
- [PULL 53/84] usb: Convert uses of usb_create(), Markus Armbruster, 2020/06/15
- [PULL 32/84] qdev: Convert to qbus_realize(), qbus_unrealize(), Markus Armbruster, 2020/06/15
- [PULL 69/84] sysbus: Tidy up sysbus_init_child_obj()'s @childsize arg, part 2, Markus Armbruster, 2020/06/15
- [PULL 68/84] hw/arm/armsse: Pass correct child size to sysbus_init_child_obj(), Markus Armbruster, 2020/06/15
- [PULL 38/84] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/06/15
- [PULL 49/84] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle, Markus Armbruster, 2020/06/15
- [PULL 44/84] isa: New isa_new(), isa_realize_and_unref() etc., Markus Armbruster, 2020/06/15