From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:58980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tsls0-0006lZ-5I for qemu-devel@nongnu.org; Tue, 08 Jan 2013 21:58:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tslry-0004w4-Gy for qemu-devel@nongnu.org; Tue, 08 Jan 2013 21:58:24 -0500 Received: from cantor2.suse.de ([195.135.220.15]:55844 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tslry-0004vw-3h for qemu-devel@nongnu.org; Tue, 08 Jan 2013 21:58:22 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 9 Jan 2013 03:58:10 +0100 Message-Id: <1357700291-15024-2-git-send-email-afaerber@suse.de> In-Reply-To: <1357700291-15024-1-git-send-email-afaerber@suse.de> References: <1357700291-15024-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 1/2] qdev: Fold state enum into bool realized List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, ehabkost@redhat.com, anthony@codemonkey.ws, =?UTF-8?q?Andreas=20F=C3=A4rber?= Whether the device was initialized or not is QOM-level information and currently unused. Drop it from device. This leaves the boolean state of whether or not DeviceClass::init was called or not, a.k.a. "realized". Suggested-by: Anthony Liguori Signed-off-by: Andreas F=C3=A4rber --- hw/qdev-addr.c | 2 +- hw/qdev-core.h | 18 ++++++++++-------- hw/qdev-properties-system.c | 4 ++-- hw/qdev-properties.c | 24 ++++++++++++------------ hw/qdev.c | 12 ++++++------ 5 Dateien ge=C3=A4ndert, 31 Zeilen hinzugef=C3=BCgt(+), 29 Zeilen entfer= nt(-) diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c index 3bfe101..b4388f6 100644 --- a/hw/qdev-addr.c +++ b/hw/qdev-addr.c @@ -40,7 +40,7 @@ static void set_taddr(Object *obj, Visitor *v, void *op= aque, Error *local_err =3D NULL; int64_t value; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } diff --git a/hw/qdev-core.h b/hw/qdev-core.h index fdf14ec..494902d 100644 --- a/hw/qdev-core.h +++ b/hw/qdev-core.h @@ -8,11 +8,6 @@ #include "hw/irq.h" #include "qapi/error.h" =20 -enum DevState { - DEV_STATE_CREATED =3D 1, - DEV_STATE_INITIALIZED, -}; - enum { DEV_NVECTORS_UNSPECIFIED =3D -1, }; @@ -49,13 +44,20 @@ typedef struct DeviceClass { const char *bus_type; } DeviceClass; =20 -/* This structure should not be accessed directly. We declare it here - so that it can be embedded in individual device state structures. */ +/** + * DeviceState: + * @realized: Indicates whether the device has been fully constructed. + * + * This structure should not be accessed directly. We declare it here + * so that it can be embedded in individual device state structures. + */ struct DeviceState { + /*< private >*/ Object parent_obj; + /*< public >*/ =20 const char *id; - enum DevState state; + bool realized; QemuOpts *opts; int hotplugged; BusState *parent_bus; diff --git a/hw/qdev-properties-system.c b/hw/qdev-properties-system.c index c73c713..ce0f793 100644 --- a/hw/qdev-properties-system.c +++ b/hw/qdev-properties-system.c @@ -42,7 +42,7 @@ static void set_pointer(Object *obj, Visitor *v, Proper= ty *prop, char *str; int ret; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -254,7 +254,7 @@ static void set_vlan(Object *obj, Visitor *v, void *o= paque, int32_t id; NetClientState *hubport; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index f724357..a8a31f5 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -32,7 +32,7 @@ static void set_enum(Object *obj, Visitor *v, void *opa= que, Property *prop =3D opaque; int *ptr =3D qdev_get_prop_ptr(dev, prop); =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -85,7 +85,7 @@ static void set_bit(Object *obj, Visitor *v, void *opaq= ue, Error *local_err =3D NULL; bool value; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -125,7 +125,7 @@ static void set_uint8(Object *obj, Visitor *v, void *= opaque, Property *prop =3D opaque; uint8_t *ptr =3D qdev_get_prop_ptr(dev, prop); =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -192,7 +192,7 @@ static void set_uint16(Object *obj, Visitor *v, void = *opaque, Property *prop =3D opaque; uint16_t *ptr =3D qdev_get_prop_ptr(dev, prop); =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -225,7 +225,7 @@ static void set_uint32(Object *obj, Visitor *v, void = *opaque, Property *prop =3D opaque; uint32_t *ptr =3D qdev_get_prop_ptr(dev, prop); =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -250,7 +250,7 @@ static void set_int32(Object *obj, Visitor *v, void *= opaque, Property *prop =3D opaque; int32_t *ptr =3D qdev_get_prop_ptr(dev, prop); =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -323,7 +323,7 @@ static void set_uint64(Object *obj, Visitor *v, void = *opaque, Property *prop =3D opaque; uint64_t *ptr =3D qdev_get_prop_ptr(dev, prop); =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -413,7 +413,7 @@ static void set_string(Object *obj, Visitor *v, void = *opaque, Error *local_err =3D NULL; char *str; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -477,7 +477,7 @@ static void set_mac(Object *obj, Visitor *v, void *op= aque, int i, pos; char *str, *p; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -569,7 +569,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, vo= id *opaque, Error *local_err =3D NULL; char *str; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -640,7 +640,7 @@ static void set_blocksize(Object *obj, Visitor *v, vo= id *opaque, const int64_t min =3D 512; const int64_t max =3D 32768; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -708,7 +708,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor= *v, void *opaque, unsigned long dom =3D 0, bus =3D 0; unsigned int slot =3D 0, func =3D 0; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } diff --git a/hw/qdev.c b/hw/qdev.c index e2a5c57..07eef5c 100644 --- a/hw/qdev.c +++ b/hw/qdev.c @@ -151,7 +151,7 @@ int qdev_init(DeviceState *dev) DeviceClass *dc =3D DEVICE_GET_CLASS(dev); int rc; =20 - assert(dev->state =3D=3D DEV_STATE_CREATED); + assert(!dev->realized); =20 rc =3D dc->init(dev); if (rc < 0) { @@ -174,7 +174,7 @@ int qdev_init(DeviceState *dev) dev->instance_id_alias, dev->alias_required_for_version); } - dev->state =3D DEV_STATE_INITIALIZED; + dev->realized =3D true; if (dev->hotplugged) { device_reset(dev); } @@ -184,7 +184,7 @@ int qdev_init(DeviceState *dev) void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, int required_for_version) { - assert(dev->state =3D=3D DEV_STATE_CREATED); + assert(!dev->realized); dev->instance_id_alias =3D alias_id; dev->alias_required_for_version =3D required_for_version; } @@ -541,7 +541,7 @@ static void qdev_set_legacy_property(Object *obj, Vis= itor *v, void *opaque, char *ptr =3D NULL; int ret; =20 - if (dev->state !=3D DEV_STATE_CREATED) { + if (dev->realized) { error_set(errp, QERR_PERMISSION_DENIED); return; } @@ -648,7 +648,7 @@ static void device_initfn(Object *obj) } =20 dev->instance_id_alias =3D -1; - dev->state =3D DEV_STATE_CREATED; + dev->realized =3D false; =20 class =3D object_get_class(OBJECT(dev)); do { @@ -671,7 +671,7 @@ static void device_finalize(Object *obj) BusState *bus; DeviceClass *dc =3D DEVICE_GET_CLASS(dev); =20 - if (dev->state =3D=3D DEV_STATE_INITIALIZED) { + if (dev->realized) { while (dev->num_child_bus) { bus =3D QLIST_FIRST(&dev->child_bus); qbus_free(bus); --=20 1.7.10.4