[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/14] qdev: inline qdev_prop_parse
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/14] qdev: inline qdev_prop_parse |
Date: |
Sat, 8 Feb 2014 11:01:49 +0100 |
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/core/qdev-properties.c | 8 +-------
include/hw/qdev-properties.h | 2 --
qdev-monitor.c | 4 ++--
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index a60a183..22ddebf 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -933,12 +933,6 @@ 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)
-{
- object_property_parse(OBJECT(dev), value, name, errp);
-}
-
void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value)
{
object_property_set_bool(OBJECT(dev), value, name, &error_abort);
@@ -1031,7 +1025,7 @@ void qdev_prop_set_globals_for_type(DeviceState *dev,
const char *typename,
if (strcmp(typename, prop->driver) != 0) {
continue;
}
- qdev_prop_parse(dev, prop->property, prop->value, &err);
+ object_property_parse(OBJECT(dev), prop->value, prop->property, &err);
if (err != NULL) {
error_propagate(errp, err);
return;
diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h
index 77c6f7c..4651459 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -168,8 +168,6 @@ extern PropertyInfo qdev_prop_arraylen;
/* Set properties between creation and init. */
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop);
-void qdev_prop_parse(DeviceState *dev, const char *name, const char *value,
- Error **errp);
void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value);
void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t value);
void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value);
diff --git a/qdev-monitor.c b/qdev-monitor.c
index 1d3b68d..4d1634c 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -145,7 +145,7 @@ static void qdev_print_devinfos(bool show_no_user)
static int set_property(const char *name, const char *value, void *opaque)
{
- DeviceState *dev = opaque;
+ Object *obj = opaque;
Error *err = NULL;
if (strcmp(name, "driver") == 0)
@@ -153,7 +153,7 @@ static int set_property(const char *name, const char
*value, void *opaque)
if (strcmp(name, "bus") == 0)
return 0;
- qdev_prop_parse(dev, name, value, &err);
+ object_property_parse(obj, value, name, &err);
if (err != NULL) {
qerror_report_err(err);
error_free(err);
--
1.8.5.3
- [Qemu-devel] [PULL 00/14] Cleanup qdev legacy properties, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 01/14] qapi: add size parser to StringInputVisitor, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 02/14] qdev: sizes are now parsed by StringInputVisitor, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 03/14] qdev: remove legacy parsers for hex8/32/64, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 04/14] qdev: legacy properties are now read-only, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 05/14] qdev: legacy properties are just strings, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 06/14] qdev: inline qdev_prop_parse,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/14] qdev: use human mode in "info qtree", Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 09/14] qdev: remove most legacy printers, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 10/14] qdev: remove hex8/32/64 property types, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 11/14] block: handle "rechs" and "large" translation options, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 12/14] qdev: add enum property types to QAPI schema, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 13/14] qdev: use QAPI type names for properties, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 14/14] qapi: refine human printing of sizes, Paolo Bonzini, 2014/02/08
- [Qemu-devel] [PULL 07/14] qapi: add human mode to StringOutputVisitor, Paolo Bonzini, 2014/02/08
- Re: [Qemu-devel] [PULL 00/14] Cleanup qdev legacy properties, Andreas Färber, 2014/02/08