openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qdev: Inline qdev_prop_parse() 

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Paolo Bonzini 2014-02-08 11:01:49 +01:00 committed by Andreas Färber
parent 7ce7ffe027
commit 98a6528461
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/core/qdev-properties.c
View File

@ -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) void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value)
{ {
object_property_set_bool(OBJECT(dev), value, name, &error_abort); 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) { if (strcmp(typename, prop->driver) != 0) {
continue; continue;
} }
qdev_prop_parse(dev, prop->property, prop->value, &err); object_property_parse(OBJECT(dev), prop->value, prop->property, &err);
if (err != NULL) { if (err != NULL) {
error_propagate(errp, err); error_propagate(errp, err);
return; return;

2
include/hw/qdev-properties.h
View File

@ -168,8 +168,6 @@ extern PropertyInfo qdev_prop_arraylen;
/* Set properties between creation and init. */ /* Set properties between creation and init. */
void *qdev_get_prop_ptr(DeviceState *dev, Property *prop); 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_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_uint8(DeviceState *dev, const char *name, uint8_t value);
void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value); void qdev_prop_set_uint16(DeviceState *dev, const char *name, uint16_t value);

4
qdev-monitor.c
View File

@ -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) static int set_property(const char *name, const char *value, void *opaque)
{ {
DeviceState *dev = opaque; Object *obj = opaque;
Error *err = NULL; Error *err = NULL;
if (strcmp(name, "driver") == 0) 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) if (strcmp(name, "bus") == 0)
return 0; return 0;
qdev_prop_parse(dev, name, value, &err); object_property_parse(obj, value, name, &err);
if (err != NULL) { if (err != NULL) {
qerror_report_err(err); qerror_report_err(err);
error_free(err); error_free(err);