[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 18/58] isa: New isa_new(), isa_realize_and_unref() etc.
From: |
Markus Armbruster |
Subject: |
[PATCH v2 18/58] isa: New isa_new(), isa_realize_and_unref() etc. |
Date: |
Fri, 29 May 2020 15:44:43 +0200 |
I'm converting from qdev_create()/qdev_init_nofail() to
qdev_new()/qdev_realize_and_unref(); recent commit "qdev: New
qdev_new(), qdev_realize(), etc." explains why.
ISA devices use qdev_create() through isa_create() and
isa_try_create().
Provide isa_new(), isa_try_new(), and isa_realize_and_unref() for
converting ISA devices.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/hw/isa/isa.h | 3 +++
hw/isa/isa-bus.c | 15 +++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h
index 02c2350274..3b6215fafe 100644
--- a/include/hw/isa/isa.h
+++ b/include/hw/isa/isa.h
@@ -105,6 +105,9 @@ MemoryRegion *isa_address_space(ISADevice *dev);
MemoryRegion *isa_address_space_io(ISADevice *dev);
ISADevice *isa_create(ISABus *bus, const char *name);
ISADevice *isa_try_create(ISABus *bus, const char *name);
+ISADevice *isa_new(const char *name);
+ISADevice *isa_try_new(const char *name);
+bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp);
ISADevice *isa_create_simple(ISABus *bus, const char *name);
ISADevice *isa_vga_init(ISABus *bus);
diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index 1c9d7e19ab..e6412d39b4 100644
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -176,6 +176,16 @@ ISADevice *isa_try_create(ISABus *bus, const char *name)
return ISA_DEVICE(dev);
}
+ISADevice *isa_new(const char *name)
+{
+ return ISA_DEVICE(qdev_new(name));
+}
+
+ISADevice *isa_try_new(const char *name)
+{
+ return ISA_DEVICE(qdev_try_new(name));
+}
+
ISADevice *isa_create_simple(ISABus *bus, const char *name)
{
ISADevice *dev;
@@ -185,6 +195,11 @@ ISADevice *isa_create_simple(ISABus *bus, const char *name)
return dev;
}
+bool isa_realize_and_unref(ISADevice *dev, ISABus *bus, Error **errp)
+{
+ return qdev_realize_and_unref(&dev->parent_obj, &bus->parent_obj, errp);
+}
+
ISADevice *isa_vga_init(ISABus *bus)
{
switch (vga_interface_type) {
--
2.21.3
- [PATCH v2 00/58] qdev: Rework how we plug into the parent bus, Markus Armbruster, 2020/05/29
- [PATCH v2 01/58] qdev: Rename qbus_realize() to qbus_init(), Markus Armbruster, 2020/05/29
- [PATCH v2 05/58] qdev: Put qdev_new() to use with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 18/58] isa: New isa_new(), isa_realize_and_unref() etc.,
Markus Armbruster <=
- [PATCH v2 06/58] qdev: Convert to qbus_realize(), qbus_unrealize(), Markus Armbruster, 2020/05/29
- [PATCH v2 02/58] Revert "hw/prep: realize the PCI root bus as part of the prep init", Markus Armbruster, 2020/05/29
- [PATCH v2 10/58] qdev: Convert uses of qdev_create() manually, Markus Armbruster, 2020/05/29
- [PATCH v2 08/58] qdev: Convert to qdev_unrealize() manually, Markus Armbruster, 2020/05/29
- [PATCH v2 07/58] qdev: Convert to qdev_unrealize() with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 03/58] Revert "hw/versatile: realize the PCI root bus as part of the versatile init", Markus Armbruster, 2020/05/29
- [PATCH v2 25/58] ssi: ssi_create_slave_no_init() is now unused, drop, Markus Armbruster, 2020/05/29
- [PATCH v2 14/58] hw/ppc: Eliminate two superfluous QOM casts, Markus Armbruster, 2020/05/29
- [PATCH v2 30/58] qdev: qdev_create(), qdev_try_create() are now unused, drop, Markus Armbruster, 2020/05/29
- [PATCH v2 12/58] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/05/29