Skip to content

Commit

Permalink
qdev: Fold state enum into bool realized
Browse files Browse the repository at this point in the history 
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 <aliguori@us.ibm.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  • Loading branch information
@afaerber
afaerber authored and Anthony Liguori committed Jan 16, 2013
1 parent 2c9ee02 commit 7983c8a
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 29 deletions.
2 changes: 1 addition & 1 deletion hw/qdev-addr.c
View file
Expand Up @@ -40,7 +40,7 @@ static void set_taddr(Object *obj, Visitor *v, void *opaque,
Error *local_err = NULL;
int64_t value;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down
18 changes: 10 additions & 8 deletions hw/qdev-core.h
View file
Expand Up @@ -8,11 +8,6 @@
#include "hw/irq.h"
#include "qapi/error.h"

enum DevState {
DEV_STATE_CREATED = 1,
DEV_STATE_INITIALIZED,
};

enum {
DEV_NVECTORS_UNSPECIFIED = -1,
};
Expand Down Expand Up @@ -49,13 +44,20 @@ typedef struct DeviceClass {
const char *bus_type;
} DeviceClass;

/* 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 >*/

const char *id;
enum DevState state;
bool realized;
QemuOpts *opts;
int hotplugged;
BusState *parent_bus;
Expand Down
4 changes: 2 additions & 2 deletions hw/qdev-properties-system.c
View file
Expand Up @@ -42,7 +42,7 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop,
char *str;
int ret;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -254,7 +254,7 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,
int32_t id;
NetClientState *hubport;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down
24 changes: 12 additions & 12 deletions hw/qdev-properties.c
View file
Expand Up @@ -32,7 +32,7 @@ static void set_enum(Object *obj, Visitor *v, void *opaque,
Property *prop = opaque;
int *ptr = qdev_get_prop_ptr(dev, prop);

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -85,7 +85,7 @@ static void set_bit(Object *obj, Visitor *v, void *opaque,
Error *local_err = NULL;
bool value;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -125,7 +125,7 @@ static void set_uint8(Object *obj, Visitor *v, void *opaque,
Property *prop = opaque;
uint8_t *ptr = qdev_get_prop_ptr(dev, prop);

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -192,7 +192,7 @@ static void set_uint16(Object *obj, Visitor *v, void *opaque,
Property *prop = opaque;
uint16_t *ptr = qdev_get_prop_ptr(dev, prop);

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -225,7 +225,7 @@ static void set_uint32(Object *obj, Visitor *v, void *opaque,
Property *prop = opaque;
uint32_t *ptr = qdev_get_prop_ptr(dev, prop);

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand All @@ -250,7 +250,7 @@ static void set_int32(Object *obj, Visitor *v, void *opaque,
Property *prop = opaque;
int32_t *ptr = qdev_get_prop_ptr(dev, prop);

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -323,7 +323,7 @@ static void set_uint64(Object *obj, Visitor *v, void *opaque,
Property *prop = opaque;
uint64_t *ptr = qdev_get_prop_ptr(dev, prop);

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -413,7 +413,7 @@ static void set_string(Object *obj, Visitor *v, void *opaque,
Error *local_err = NULL;
char *str;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -477,7 +477,7 @@ static void set_mac(Object *obj, Visitor *v, void *opaque,
int i, pos;
char *str, *p;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -569,7 +569,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
Error *local_err = NULL;
char *str;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -640,7 +640,7 @@ static void set_blocksize(Object *obj, Visitor *v, void *opaque,
const int64_t min = 512;
const int64_t max = 32768;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -708,7 +708,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, void *opaque,
unsigned long dom = 0, bus = 0;
unsigned int slot = 0, func = 0;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down
12 changes: 6 additions & 6 deletions hw/qdev.c
View file
Expand Up @@ -151,7 +151,7 @@ int qdev_init(DeviceState *dev)
DeviceClass *dc = DEVICE_GET_CLASS(dev);
int rc;

assert(dev->state == DEV_STATE_CREATED);
assert(!dev->realized);

rc = dc->init(dev);
if (rc < 0) {
Expand All @@ -174,7 +174,7 @@ int qdev_init(DeviceState *dev)
dev->instance_id_alias,
dev->alias_required_for_version);
}
dev->state = DEV_STATE_INITIALIZED;
dev->realized = true;
if (dev->hotplugged) {
device_reset(dev);
}
Expand All @@ -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 == DEV_STATE_CREATED);
assert(!dev->realized);
dev->instance_id_alias = alias_id;
dev->alias_required_for_version = required_for_version;
}
Expand Down Expand Up @@ -546,7 +546,7 @@ static void qdev_set_legacy_property(Object *obj, Visitor *v, void *opaque,
char *ptr = NULL;
int ret;

if (dev->state != DEV_STATE_CREATED) {
if (dev->realized) {
error_set(errp, QERR_PERMISSION_DENIED);
return;
}
Expand Down Expand Up @@ -653,7 +653,7 @@ static void device_initfn(Object *obj)
}

dev->instance_id_alias = -1;
dev->state = DEV_STATE_CREATED;
dev->realized = false;

class = object_get_class(OBJECT(dev));
do {
Expand All @@ -676,7 +676,7 @@ static void device_finalize(Object *obj)
BusState *bus;
DeviceClass *dc = DEVICE_GET_CLASS(dev);

if (dev->state == DEV_STATE_INITIALIZED) {
if (dev->realized) {
while (dev->num_child_bus) {
bus = QLIST_FIRST(&dev->child_bus);
qbus_free(bus);
Expand Down

0 comments on commit 7983c8a

Please sign in to comment.