[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 23/27] qdev: inline qdev_prop_set into qdev_prop_
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 23/27] qdev: inline qdev_prop_set into qdev_prop_set_ptr |
Date: |
Sat, 4 Feb 2012 09:02:53 +0100 |
qdev_prop_set is not needed anymore except for hacks, simplify it and
inline it.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/qdev-properties.c | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 5a11676..b3cd2a8 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -1115,24 +1115,6 @@ int qdev_prop_parse(DeviceState *dev, const char *name,
const char *value)
return 0;
}
-static void qdev_prop_set(DeviceState *dev, const char *name, void *src, enum
PropertyType type)
-{
- Property *prop;
-
- prop = qdev_prop_find(dev, name);
- if (!prop) {
- fprintf(stderr, "%s: property \"%s.%s\" not found\n",
- __FUNCTION__, object_get_typename(OBJECT(dev)), name);
- abort();
- }
- if (prop->info->type != type) {
- fprintf(stderr, "%s: property \"%s.%s\" type mismatch\n",
- __FUNCTION__, object_get_typename(OBJECT(dev)), name);
- abort();
- }
- qdev_prop_cpy(dev, prop, src);
-}
-
void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value)
{
Error *errp = NULL;
@@ -1248,7 +1230,13 @@ void qdev_prop_set_enum(DeviceState *dev, const char
*name, int value)
void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value)
{
- qdev_prop_set(dev, name, &value, PROP_TYPE_PTR);
+ Property *prop;
+ void **ptr;
+
+ prop = qdev_prop_find(dev, name);
+ assert(prop && prop->info == &qdev_prop_ptr);
+ ptr = qdev_get_prop_ptr(dev, prop);
+ *ptr = value;
}
void qdev_prop_set_defaults(DeviceState *dev, Property *props)
--
1.7.7.6
- [Qemu-devel] [PATCH v2 09/27] qom: add object_resolve_path_type, (continued)
- [Qemu-devel] [PATCH v2 09/27] qom: add object_resolve_path_type, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 27/27] omap: remove PROP_PTR properties, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 11/27] qom: fix canonical paths vs. interfaces, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 22/27] qdev: access properties via QOM, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 23/27] qdev: inline qdev_prop_set into qdev_prop_set_ptr,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 19/27] qdev: remove parse/print methods for pointer properties, Paolo Bonzini, 2012/02/04
- Re: [Qemu-devel] [PATCH v2 00/27] next steps for qdev & QOM, Paolo Bonzini, 2012/02/07