[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/12] qdev: legacy properties are now read-only
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 04/12] qdev: legacy properties are now read-only |
Date: |
Thu, 30 Jan 2014 14:09:46 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/core/qdev-properties.c | 10 +---------
hw/core/qdev.c | 30 ++----------------------------
include/hw/qdev-core.h | 1 -
3 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index e223ce1..a60a183 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -936,15 +936,7 @@ void error_set_from_qdev_prop_error(Error **errp, int ret,
DeviceState *dev,
void qdev_prop_parse(DeviceState *dev, const char *name, const char *value,
Error **errp)
{
- char *legacy_name;
-
- legacy_name = g_strdup_printf("legacy-%s", name);
- if (object_property_get_type(OBJECT(dev), legacy_name, NULL)) {
- object_property_parse(OBJECT(dev), value, legacy_name, errp);
- } else {
- object_property_parse(OBJECT(dev), value, name, errp);
- }
- g_free(legacy_name);
+ object_property_parse(OBJECT(dev), value, name, errp);
}
void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value)
diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 82a9123..7c1b732 100644
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -578,31 +578,6 @@ static void qdev_get_legacy_property(Object *obj, Visitor
*v, void *opaque,
visit_type_str(v, &ptr, name, errp);
}
-static void qdev_set_legacy_property(Object *obj, Visitor *v, void *opaque,
- const char *name, Error **errp)
-{
- DeviceState *dev = DEVICE(obj);
- Property *prop = opaque;
- Error *local_err = NULL;
- char *ptr = NULL;
- int ret;
-
- if (dev->realized) {
- qdev_prop_set_after_realize(dev, name, errp);
- return;
- }
-
- visit_type_str(v, &ptr, name, &local_err);
- if (local_err) {
- error_propagate(errp, local_err);
- return;
- }
-
- ret = prop->info->parse(dev, prop, ptr);
- error_set_from_qdev_prop_error(errp, ret, dev, prop, ptr);
- g_free(ptr);
-}
-
/**
* @qdev_add_legacy_property - adds a legacy property
*
@@ -618,8 +593,7 @@ void qdev_property_add_legacy(DeviceState *dev, Property
*prop,
gchar *name, *type;
/* Register pointer properties as legacy properties */
- if (!prop->info->print && !prop->info->parse &&
- (prop->info->set || prop->info->get)) {
+ if (!prop->info->print && prop->info->get) {
return;
}
@@ -629,7 +603,7 @@ void qdev_property_add_legacy(DeviceState *dev, Property
*prop,
object_property_add(OBJECT(dev), name, type,
prop->info->print ? qdev_get_legacy_property :
prop->info->get,
- prop->info->parse ? qdev_set_legacy_property :
prop->info->set,
+ NULL,
NULL,
prop, errp);
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 2c4f140..d0cda38 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -209,7 +209,6 @@ struct PropertyInfo {
const char *name;
const char *legacy_name;
const char **enum_table;
- int (*parse)(DeviceState *dev, Property *prop, const char *str);
int (*print)(DeviceState *dev, Property *prop, char *dest, size_t len);
ObjectPropertyAccessor *get;
ObjectPropertyAccessor *set;
--
1.8.4.2
- [Qemu-devel] [PATCH 00/12] qdev: cleanup legacy properties, Paolo Bonzini, 2014/01/30
- [Qemu-devel] [PATCH 01/12] qapi: add size parser to StringInputVisitor, Paolo Bonzini, 2014/01/30
- [Qemu-devel] [PATCH 02/12] qdev: sizes are now parsed by StringInputVisitor, Paolo Bonzini, 2014/01/30
- [Qemu-devel] [PATCH 03/12] qdev: remove legacy parsers for hex8/32/64, Paolo Bonzini, 2014/01/30
- [Qemu-devel] [PATCH 04/12] qdev: legacy properties are now read-only,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 05/12] qdev: legacy properties are just strings, Paolo Bonzini, 2014/01/30
- [Qemu-devel] [PATCH 06/12] qdev: inline qdev_prop_parse, Paolo Bonzini, 2014/01/30
- [Qemu-devel] [PATCH 07/12] qapi: add human mode to StringOutputVisitor, Paolo Bonzini, 2014/01/30
- [Qemu-devel] [PATCH 08/12] qdev: use human mode in "info qtree", Paolo Bonzini, 2014/01/30