[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/25] qdev: remove qdev_prop_set_defaults
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 08/25] qdev: remove qdev_prop_set_defaults |
Date: |
Tue, 3 Apr 2012 13:15:36 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/qdev-properties.c | 22 ----------------------
hw/qdev.c | 28 +++++++++++++++++++++++-----
hw/qdev.h | 1 -
3 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index bff9152..85897c7 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1083,28 +1083,6 @@ void qdev_prop_set_ptr(DeviceState *dev, const char
*name, void *value)
*ptr = value;
}
-void qdev_prop_set_defaults(DeviceState *dev, Property *props)
-{
- Object *obj = OBJECT(dev);
- if (!props)
- return;
- for (; props->name; props++) {
- Error *errp = NULL;
- if (props->qtype == QTYPE_NONE) {
- continue;
- }
- if (props->qtype == QTYPE_QBOOL) {
- object_property_set_bool(obj, props->defval, props->name, &errp);
- } else if (props->info->enum_table) {
- object_property_set_str(obj,
props->info->enum_table[props->defval],
- props->name, &errp);
- } else if (props->qtype == QTYPE_QINT) {
- object_property_set_int(obj, props->defval, props->name, &errp);
- }
- assert_no_error(errp);
- }
-}
-
static QTAILQ_HEAD(, GlobalProperty) global_props =
QTAILQ_HEAD_INITIALIZER(global_props);
static void qdev_prop_register_global(GlobalProperty *prop)
diff --git a/hw/qdev.c b/hw/qdev.c
index bb6c1aa..4ac5616 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -90,7 +90,6 @@ void qdev_set_parent_bus(DeviceState *dev, BusState *bus)
qdev_property_add_legacy(dev, prop, NULL);
qdev_property_add_static(dev, prop, NULL);
}
- qdev_prop_set_defaults(dev, dev->parent_bus->info->props);
}
/* Create a new device. This only initializes the device state structure
@@ -592,6 +591,9 @@ void qdev_property_add_legacy(DeviceState *dev, Property
*prop,
void qdev_property_add_static(DeviceState *dev, Property *prop,
Error **errp)
{
+ Error *local_err = NULL;
+ Object *obj = OBJECT(dev);
+
/*
* TODO qdev_prop_ptr does not have getters or setters. It must
* go now that it can be replaced with links. The test should be
@@ -601,10 +603,28 @@ void qdev_property_add_static(DeviceState *dev, Property
*prop,
return;
}
- object_property_add(OBJECT(dev), prop->name, prop->info->name,
+ object_property_add(obj, prop->name, prop->info->name,
prop->info->get, prop->info->set,
prop->info->release,
- prop, errp);
+ prop, &local_err);
+
+ if (local_err) {
+ error_propagate(errp, local_err);
+ return;
+ }
+ if (prop->qtype == QTYPE_NONE) {
+ return;
+ }
+
+ if (prop->qtype == QTYPE_QBOOL) {
+ object_property_set_bool(obj, prop->defval, prop->name, &local_err);
+ } else if (prop->info->enum_table) {
+ object_property_set_str(obj, prop->info->enum_table[prop->defval],
+ prop->name, &local_err);
+ } else if (prop->qtype == QTYPE_QINT) {
+ object_property_set_int(obj, prop->defval, prop->name, &local_err);
+ }
+ assert_no_error(local_err);
}
static void device_initfn(Object *obj)
@@ -624,8 +644,6 @@ static void device_initfn(Object *obj)
qdev_property_add_legacy(dev, prop, NULL);
qdev_property_add_static(dev, prop, NULL);
}
-
- qdev_prop_set_defaults(dev, qdev_get_props(dev));
}
/* Unlink device from bus and free the structure. */
diff --git a/hw/qdev.h b/hw/qdev.h
index a8df42f..12de112 100644
--- a/hw/qdev.h
+++ b/hw/qdev.h
@@ -308,7 +308,6 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char
*name, uint8_t *value);
void qdev_prop_set_enum(DeviceState *dev, const char *name, int value);
/* FIXME: Remove opaque pointer properties. */
void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value);
-void qdev_prop_set_defaults(DeviceState *dev, Property *props);
void qdev_prop_register_global_list(GlobalProperty *props);
void qdev_prop_set_globals(DeviceState *dev);
--
1.7.9.3
- Re: [Qemu-devel] [PATCH 03/25] qom: add class_base_init, (continued)
- [Qemu-devel] [PATCH 05/25] qom: push type up to Object, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 06/25] qdev: fix -device foo,?, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 07/25] qdev: use object_property_print in info qtree, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 08/25] qdev: remove qdev_prop_set_defaults,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/25] qdev: move bus properties to a separate global, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 10/25] qdev: do not propagate properties to subclasses, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 11/25] qdev: pick global properties from superclasses, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 12/25] qdev: factor setting of global properties, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 13/25] qdev: replace bus properties with superclass properties, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 14/25] qapi: add Visitor interfaces for uint*_t and int*_t, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 15/25] qdev: use int32_t container for devfn property, Paolo Bonzini, 2012/04/03
- [Qemu-devel] [PATCH 17/25] qdev: remove PropertyInfo range checking, Paolo Bonzini, 2012/04/03