From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH v3 06/39] qdev: Convert to qbus_realize(), qbus_unrealize()
Date: Tue, 9 Jun 2020 18:38:59 +0200 [thread overview]
Message-ID: <20200609163932.1566209-7-armbru@redhat.com> (raw)
In-Reply-To: <20200609163932.1566209-1-armbru@redhat.com>
I'm going to convert device realization to qdev_realize() with the
help of Coccinelle. Convert bus realization to qbus_realize() first,
to get it out of Coccinelle's way. Readability improves.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/core/qdev.c | 10 +++-------
hw/pci/pci.c | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index f2c5cee278..b7355fbcd0 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -1024,9 +1024,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
resettable_state_clear(&dev->reset);
QLIST_FOREACH(bus, &dev->child_bus, sibling) {
- object_property_set_bool(OBJECT(bus), true, "realized",
- &local_err);
- if (local_err != NULL) {
+ if (!qbus_realize(bus, errp)) {
goto child_realize_fail;
}
}
@@ -1051,8 +1049,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
} else if (!value && dev->realized) {
QLIST_FOREACH(bus, &dev->child_bus, sibling) {
- object_property_set_bool(OBJECT(bus), false, "realized",
- &error_abort);
+ qbus_unrealize(bus);
}
if (qdev_get_vmsd(dev)) {
vmstate_unregister(VMSTATE_IF(dev), qdev_get_vmsd(dev), dev);
@@ -1070,8 +1067,7 @@ static void device_set_realized(Object *obj, bool value, Error **errp)
child_realize_fail:
QLIST_FOREACH(bus, &dev->child_bus, sibling) {
- object_property_set_bool(OBJECT(bus), false, "realized",
- &error_abort);
+ qbus_unrealize(bus);
}
if (qdev_get_vmsd(dev)) {
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 70c66965f5..6947c741c3 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -456,7 +456,7 @@ void pci_root_bus_cleanup(PCIBus *bus)
{
pci_bus_uninit(bus);
/* the caller of the unplug hotplug handler will delete this device */
- object_property_set_bool(OBJECT(bus), false, "realized", &error_abort);
+ qbus_unrealize(BUS(bus));
}
void pci_bus_irqs(PCIBus *bus, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq,
--
2.26.2
next prev parent reply other threads:[~2020-06-09 16:53 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 16:38 [PATCH v3 00/39] qdev: Rework how we plug into the parent bus Markus Armbruster
2020-06-09 16:38 ` [PATCH v3 01/39] qdev: Rename qbus_realize() to qbus_init() Markus Armbruster
2020-06-09 16:38 ` [PATCH v3 02/39] Revert "hw/prep: realize the PCI root bus as part of the prep init" Markus Armbruster
2020-06-09 16:38 ` [PATCH v3 03/39] Revert "hw/versatile: realize the PCI root bus as part of the versatile init" Markus Armbruster
2020-06-09 16:38 ` [PATCH v3 04/39] qdev: New qdev_new(), qdev_realize(), etc Markus Armbruster
2020-06-09 16:38 ` [PATCH v3 05/39] qdev: Put qdev_new() to use with Coccinelle Markus Armbruster
2020-06-09 16:38 ` Markus Armbruster [this message]
2020-06-09 16:39 ` [PATCH v3 07/39] qdev: Convert to qdev_unrealize() " Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 08/39] qdev: Convert to qdev_unrealize() manually Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 09/39] qdev: Convert uses of qdev_create() with Coccinelle Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 10/39] qdev: Convert uses of qdev_create() manually Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 11/39] qdev: Convert uses of qdev_set_parent_bus() with Coccinelle Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 12/39] qdev: Convert uses of qdev_set_parent_bus() manually Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 13/39] pci: New pci_new(), pci_realize_and_unref() etc Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 14/39] hw/ppc: Eliminate two superfluous QOM casts Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 15/39] pci: Convert uses of pci_create() etc. with Coccinelle Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 16/39] pci: Convert uses of pci_create() etc. manually Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 17/39] pci: pci_create(), pci_create_multifunction() are now unused, drop Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 18/39] isa: New isa_new(), isa_realize_and_unref() etc Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 19/39] isa: Convert uses of isa_create() with Coccinelle Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 20/39] isa: Convert uses of isa_create(), isa_try_create() manually Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 21/39] isa: isa_create(), isa_try_create() are now unused, drop Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 22/39] ssi: ssi_auto_connect_slaves() never does anything, drop Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 23/39] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 24/39] ssi: Convert last use of ssi_create_slave_no_init() manually Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 25/39] ssi: ssi_create_slave_no_init() is now unused, drop Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 26/39] usb: New usb_new(), usb_realize_and_unref() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 27/39] usb: Convert uses of usb_create() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 28/39] usb: usb_create() is now unused, drop Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 29/39] usb: Eliminate usb_try_create_simple() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 30/39] qdev: qdev_create(), qdev_try_create() are now unused, drop Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 31/39] auxbus: Rename aux_init_bus() to aux_bus_init() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 32/39] auxbus: New aux_bus_realize(), pairing with aux_bus_init() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 33/39] auxbus: Convert a use of qdev_set_parent_bus() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 34/39] auxbus: Eliminate aux_create_slave() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 35/39] qom: Tidy up a few object_initialize_child() calls Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 36/39] qom: Less verbose object_initialize_child() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 37/39] macio: Convert use of qdev_set_parent_bus() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 38/39] macio: Eliminate macio_init_child_obj() Markus Armbruster
2020-06-09 16:39 ` [PATCH v3 39/39] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls Markus Armbruster
2020-06-09 16:40 ` [PATCH v3 00/39] qdev: Rework how we plug into the parent bus Markus Armbruster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200609163932.1566209-7-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).