From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Bandan Das" <bsd@redhat.com>, "Andreas Färber" <afaerber@suse.de>
Subject: [Qemu-devel] [PULL for-2.0-rc0 28/31] qdev: Prepare realize/unrealize hooks for BusState
Date: Wed, 12 Mar 2014 22:10:00 +0100 [thread overview]
Message-ID: <1394658603-13650-29-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1394658603-13650-1-git-send-email-afaerber@suse.de>
From: Bandan Das <bsd@redhat.com>
Add a "realized" property calling realize/unrealize hooks as for devices.
Signed-off-by: Bandan Das <bsd@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
hw/core/qdev.c | 41 +++++++++++++++++++++++++++++++++++++++++
include/hw/qdev-core.h | 6 ++++++
2 files changed, 47 insertions(+)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 71b7045..7e58259 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -501,6 +501,45 @@ static void bus_unparent(Object *obj)
}
}
+static bool bus_get_realized(Object *obj, Error **err)
+{
+ BusState *bus = BUS(obj);
+
+ return bus->realized;
+}
+
+static void bus_set_realized(Object *obj, bool value, Error **err)
+{
+ BusState *bus = BUS(obj);
+ BusClass *bc = BUS_GET_CLASS(bus);
+ Error *local_err = NULL;
+
+ if (value && !bus->realized) {
+ if (bc->realize) {
+ bc->realize(bus, &local_err);
+
+ if (local_err != NULL) {
+ goto error;
+ }
+
+ }
+ } else if (!value && bus->realized) {
+ if (bc->unrealize) {
+ bc->unrealize(bus, &local_err);
+
+ if (local_err != NULL) {
+ goto error;
+ }
+ }
+ }
+
+ bus->realized = value;
+ return;
+
+error:
+ error_propagate(err, local_err);
+}
+
void qbus_create_inplace(void *bus, size_t size, const char *typename,
DeviceState *parent, const char *name)
{
@@ -889,6 +928,8 @@ static void qbus_initfn(Object *obj)
object_property_add_link(obj, QDEV_HOTPLUG_HANDLER_PROPERTY,
TYPE_HOTPLUG_HANDLER,
(Object **)&bus->hotplug_handler, NULL);
+ object_property_add_bool(obj, "realized",
+ bus_get_realized, bus_set_realized, NULL);
}
static char *default_bus_get_fw_dev_path(DeviceState *dev)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 1ed0691..dbe473c 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -36,6 +36,8 @@ typedef int (*qdev_event)(DeviceState *dev);
typedef void (*qdev_resetfn)(DeviceState *dev);
typedef void (*DeviceRealize)(DeviceState *dev, Error **errp);
typedef void (*DeviceUnrealize)(DeviceState *dev, Error **errp);
+typedef void (*BusRealize)(BusState *bus, Error **errp);
+typedef void (*BusUnrealize)(BusState *bus, Error **errp);
struct VMStateDescription;
@@ -174,6 +176,9 @@ struct BusClass {
*/
char *(*get_fw_dev_path)(DeviceState *dev);
void (*reset)(BusState *bus);
+ BusRealize realize;
+ BusUnrealize unrealize;
+
/* maximum devices allowed on the bus, 0: no limit. */
int max_dev;
/* number of automatically allocated bus ids (e.g. ide.0) */
@@ -199,6 +204,7 @@ struct BusState {
int allow_hotplug;
HotplugHandler *hotplug_handler;
int max_index;
+ bool realized;
QTAILQ_HEAD(ChildrenHead, BusChild) children;
QLIST_ENTRY(BusState) sibling;
};
--
1.8.4.5
next prev parent reply other threads:[~2014-03-12 21:10 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-12 21:09 [Qemu-devel] [PULL for-2.0-rc0 00/31] QOM devices patch queue 2014-03-12 Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 01/31] qdev: Fix bus dependency of DeviceState::hotpluggable getter Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 02/31] qdev: Set DeviceClass::hotpluggable default in class_init() Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 03/31] qdev-monitor: Set properties after parent is assigned in device_add Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 04/31] qom: Avoid leaking str and bool properties on failure Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 05/31] ssi: Convert legacy SSI_SLAVE -> DEVICE casts Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 06/31] ssi: Convert legacy SSI_BUS -> BUS casts Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 07/31] misc/max111x: Create abstract max111x type Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 08/31] misc/max111x: QOM casting sweep Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 09/31] ssi: Remove SSI_SLAVE_FROM_QDEV() macro Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 10/31] block/m25p80: Remove FROM_SSI_SLAVE() usages Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 11/31] spapr-pci: Change the default PCI bus naming Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 12/31] qdev-monitor-test: Simplify using g_assert_cmpstr() Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 13/31] qdev-monitor-test: Don't test human-readable error message Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 14/31] hw/core: Introduce QEMU machine as QOM object Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 15/31] vl: Use MachineClass instead of global QEMUMachine list Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 16/31] hw/boards: Convert current_machine to MachineState Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 17/31] qom-test: Test QOM properties Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 18/31] tests: Clean up IndustryPack TPCI200 gcov paths Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 19/31] tests: Add virtio-blk qtest Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 20/31] tests: Add virtio-balloon qtest Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 21/31] tests: Add virtio-rng qtest Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 22/31] tests: Add virtio-scsi qtest Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 23/31] tests: Add virtio-serial qtest Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 24/31] tests: Add virtio-console qtest Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 25/31] virtio-console: QOM cast cleanup for VirtConsole Andreas Färber
2014-03-13 15:32 ` [Qemu-devel] virtio-serial broken in qemu.git (was: Re: [PULL for-2.0-rc0 25/31] virtio-console: QOM cast cleanup for VirtConsole) Richard W.M. Jones
2014-03-13 15:43 ` Richard W.M. Jones
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 26/31] virtio-serial-port: Convert to QOM realize/unrealize Andreas Färber
2014-03-12 21:09 ` [Qemu-devel] [PULL for-2.0-rc0 27/31] tests: Add spapr-pci-host-bridge qtest Andreas Färber
2014-03-12 21:10 ` Andreas Färber [this message]
2014-03-12 21:10 ` [Qemu-devel] [PULL for-2.0-rc0 29/31] qdev: Realize buses on device realization Andreas Färber
2014-03-12 21:10 ` [Qemu-devel] [PULL for-2.0-rc0 30/31] pci: Move VMState registration/unregistration to QOM realize/unrealize Andreas Färber
2014-03-12 21:10 ` [Qemu-devel] [PULL for-2.0-rc0 31/31] libqtest: Fix possible deadlock in qtest initialization Andreas Färber
2014-03-12 22:42 ` [Qemu-devel] [PULL for-2.0-rc0 00/31] QOM devices patch queue 2014-03-12 Peter Maydell
2014-03-13 0:19 ` Andreas Färber
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=1394658603-13650-29-git-send-email-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=bsd@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).