[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/10] qdev: Eliminate GlobalProperty 'used' and 'us
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 09/10] qdev: Eliminate GlobalProperty 'used' and 'user_provided' fields |
Date: |
Wed, 15 Jun 2016 17:32:52 -0300 |
Those fields are not used for anyting and not needed anymore.
Signed-off-by: Eduardo Habkost <address@hidden>
---
hw/core/qdev-properties.c | 2 --
include/hw/qdev-core.h | 5 -----
vl.c | 1 -
3 files changed, 8 deletions(-)
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index c14791d..733cc45 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1048,7 +1048,6 @@ static void qdev_prop_set_globals_for_type(DeviceState
*dev,
if (strcmp(typename, prop->driver) != 0) {
continue;
}
- prop->used = true;
object_property_parse(OBJECT(dev), prop->value, prop->property, &err);
if (err != NULL) {
error_prepend(&err, "can't apply global %s.%s=%s: ",
@@ -1056,7 +1055,6 @@ static void qdev_prop_set_globals_for_type(DeviceState
*dev,
if (prop->errp) {
error_propagate(prop->errp, err);
} else {
- assert(prop->user_provided);
error_reportf_err(err, "Warning: ");
}
}
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 16e7cc0..5bbd4b0 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -259,17 +259,12 @@ struct PropertyInfo {
* @errp: If set, error_propagate() will be called on errors when applying
* the property. &error_abort or &error_fatal may be used to make
* errors automatically abort or exit QEMU.
- * @user_provided: Set to true if property comes from user-provided config
- * (command-line or config file).
- * @used: Set to true if property was used when initializing a device.
*/
typedef struct GlobalProperty {
const char *driver;
const char *property;
const char *value;
Error **errp;
- bool user_provided;
- bool used;
} GlobalProperty;
/*** Board API. This should go away once we have a machine config file. ***/
diff --git a/vl.c b/vl.c
index bf3bfa3..ee3e3c8 100644
--- a/vl.c
+++ b/vl.c
@@ -2951,7 +2951,6 @@ static int global_init_func(void *opaque, QemuOpts *opts,
Error **errp)
g->driver = driver;
g->property = prop;
g->value = qemu_opt_get(opts, "value");
- g->user_provided = true;
qdev_prop_register_global(g);
return 0;
}
--
2.5.5