qdev: Fold state enum into bool realized
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>
This commit is contained in:
parent
2c9ee0291f
commit
7983c8a335
|
@ -40,7 +40,7 @@ static void set_taddr(Object *obj, Visitor *v, void *opaque,
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
int64_t value;
|
int64_t value;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,11 +8,6 @@
|
||||||
#include "hw/irq.h"
|
#include "hw/irq.h"
|
||||||
#include "qapi/error.h"
|
#include "qapi/error.h"
|
||||||
|
|
||||||
enum DevState {
|
|
||||||
DEV_STATE_CREATED = 1,
|
|
||||||
DEV_STATE_INITIALIZED,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
DEV_NVECTORS_UNSPECIFIED = -1,
|
DEV_NVECTORS_UNSPECIFIED = -1,
|
||||||
};
|
};
|
||||||
|
@ -49,13 +44,20 @@ typedef struct DeviceClass {
|
||||||
const char *bus_type;
|
const char *bus_type;
|
||||||
} DeviceClass;
|
} 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 {
|
struct DeviceState {
|
||||||
|
/*< private >*/
|
||||||
Object parent_obj;
|
Object parent_obj;
|
||||||
|
/*< public >*/
|
||||||
|
|
||||||
const char *id;
|
const char *id;
|
||||||
enum DevState state;
|
bool realized;
|
||||||
QemuOpts *opts;
|
QemuOpts *opts;
|
||||||
int hotplugged;
|
int hotplugged;
|
||||||
BusState *parent_bus;
|
BusState *parent_bus;
|
||||||
|
|
|
@ -42,7 +42,7 @@ static void set_pointer(Object *obj, Visitor *v, Property *prop,
|
||||||
char *str;
|
char *str;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -254,7 +254,7 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque,
|
||||||
int32_t id;
|
int32_t id;
|
||||||
NetClientState *hubport;
|
NetClientState *hubport;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,7 +32,7 @@ static void set_enum(Object *obj, Visitor *v, void *opaque,
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
int *ptr = qdev_get_prop_ptr(dev, prop);
|
int *ptr = qdev_get_prop_ptr(dev, prop);
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -85,7 +85,7 @@ static void set_bit(Object *obj, Visitor *v, void *opaque,
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
bool value;
|
bool value;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -125,7 +125,7 @@ static void set_uint8(Object *obj, Visitor *v, void *opaque,
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
uint8_t *ptr = qdev_get_prop_ptr(dev, prop);
|
uint8_t *ptr = qdev_get_prop_ptr(dev, prop);
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -192,7 +192,7 @@ static void set_uint16(Object *obj, Visitor *v, void *opaque,
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
uint16_t *ptr = qdev_get_prop_ptr(dev, prop);
|
uint16_t *ptr = qdev_get_prop_ptr(dev, prop);
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -225,7 +225,7 @@ static void set_uint32(Object *obj, Visitor *v, void *opaque,
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
|
uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -250,7 +250,7 @@ static void set_int32(Object *obj, Visitor *v, void *opaque,
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
int32_t *ptr = qdev_get_prop_ptr(dev, prop);
|
int32_t *ptr = qdev_get_prop_ptr(dev, prop);
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -323,7 +323,7 @@ static void set_uint64(Object *obj, Visitor *v, void *opaque,
|
||||||
Property *prop = opaque;
|
Property *prop = opaque;
|
||||||
uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
|
uint64_t *ptr = qdev_get_prop_ptr(dev, prop);
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -413,7 +413,7 @@ static void set_string(Object *obj, Visitor *v, void *opaque,
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
char *str;
|
char *str;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -477,7 +477,7 @@ static void set_mac(Object *obj, Visitor *v, void *opaque,
|
||||||
int i, pos;
|
int i, pos;
|
||||||
char *str, *p;
|
char *str, *p;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -569,7 +569,7 @@ static void set_pci_devfn(Object *obj, Visitor *v, void *opaque,
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
char *str;
|
char *str;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -640,7 +640,7 @@ static void set_blocksize(Object *obj, Visitor *v, void *opaque,
|
||||||
const int64_t min = 512;
|
const int64_t min = 512;
|
||||||
const int64_t max = 32768;
|
const int64_t max = 32768;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -708,7 +708,7 @@ static void set_pci_host_devaddr(Object *obj, Visitor *v, void *opaque,
|
||||||
unsigned long dom = 0, bus = 0;
|
unsigned long dom = 0, bus = 0;
|
||||||
unsigned int slot = 0, func = 0;
|
unsigned int slot = 0, func = 0;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
12
hw/qdev.c
12
hw/qdev.c
|
@ -151,7 +151,7 @@ int qdev_init(DeviceState *dev)
|
||||||
DeviceClass *dc = DEVICE_GET_CLASS(dev);
|
DeviceClass *dc = DEVICE_GET_CLASS(dev);
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
assert(dev->state == DEV_STATE_CREATED);
|
assert(!dev->realized);
|
||||||
|
|
||||||
rc = dc->init(dev);
|
rc = dc->init(dev);
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
|
@ -174,7 +174,7 @@ int qdev_init(DeviceState *dev)
|
||||||
dev->instance_id_alias,
|
dev->instance_id_alias,
|
||||||
dev->alias_required_for_version);
|
dev->alias_required_for_version);
|
||||||
}
|
}
|
||||||
dev->state = DEV_STATE_INITIALIZED;
|
dev->realized = true;
|
||||||
if (dev->hotplugged) {
|
if (dev->hotplugged) {
|
||||||
device_reset(dev);
|
device_reset(dev);
|
||||||
}
|
}
|
||||||
|
@ -184,7 +184,7 @@ int qdev_init(DeviceState *dev)
|
||||||
void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
|
void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id,
|
||||||
int required_for_version)
|
int required_for_version)
|
||||||
{
|
{
|
||||||
assert(dev->state == DEV_STATE_CREATED);
|
assert(!dev->realized);
|
||||||
dev->instance_id_alias = alias_id;
|
dev->instance_id_alias = alias_id;
|
||||||
dev->alias_required_for_version = required_for_version;
|
dev->alias_required_for_version = required_for_version;
|
||||||
}
|
}
|
||||||
|
@ -546,7 +546,7 @@ static void qdev_set_legacy_property(Object *obj, Visitor *v, void *opaque,
|
||||||
char *ptr = NULL;
|
char *ptr = NULL;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (dev->state != DEV_STATE_CREATED) {
|
if (dev->realized) {
|
||||||
error_set(errp, QERR_PERMISSION_DENIED);
|
error_set(errp, QERR_PERMISSION_DENIED);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -653,7 +653,7 @@ static void device_initfn(Object *obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
dev->instance_id_alias = -1;
|
dev->instance_id_alias = -1;
|
||||||
dev->state = DEV_STATE_CREATED;
|
dev->realized = false;
|
||||||
|
|
||||||
class = object_get_class(OBJECT(dev));
|
class = object_get_class(OBJECT(dev));
|
||||||
do {
|
do {
|
||||||
|
@ -676,7 +676,7 @@ static void device_finalize(Object *obj)
|
||||||
BusState *bus;
|
BusState *bus;
|
||||||
DeviceClass *dc = DEVICE_GET_CLASS(dev);
|
DeviceClass *dc = DEVICE_GET_CLASS(dev);
|
||||||
|
|
||||||
if (dev->state == DEV_STATE_INITIALIZED) {
|
if (dev->realized) {
|
||||||
while (dev->num_child_bus) {
|
while (dev->num_child_bus) {
|
||||||
bus = QLIST_FIRST(&dev->child_bus);
|
bus = QLIST_FIRST(&dev->child_bus);
|
||||||
qbus_free(bus);
|
qbus_free(bus);
|
||||||
|
|
Loading…
Reference in a new issue