[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 25/28] qdev-props: remove errp from GlobalProperty
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 25/28] qdev-props: remove errp from GlobalProperty |
Date: |
Fri, 4 Jan 2019 21:30:39 +0400 |
All qdev_prop_register_global() set &error_fatal for errp, except
'-rtc driftfix=slew', which arguably should also use &error_fatal, as
otherwise failing to apply the property would only report a warning.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Acked-by: Eduardo Habkost <address@hidden>
---
include/hw/qdev-core.h | 8 ++------
hw/core/qdev-properties.c | 4 ++--
qom/cpu.c | 1 -
target/i386/cpu.c | 1 -
target/sparc/cpu.c | 1 -
vl.c | 1 -
6 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h
index 86b05baeeb..bc014c1c9f 100644
--- a/include/hw/qdev-core.h
+++ b/include/hw/qdev-core.h
@@ -250,18 +250,14 @@ struct PropertyInfo {
/**
* GlobalProperty:
* @used: Set to true if property was used when initializing a device.
- * @errp: Error destination, used like first argument of error_setg()
- * in case property setting fails later. If @errp is NULL, we
- * print warnings instead of ignoring errors silently. For
- * hotplugged devices, errp is always ignored and warnings are
- * printed instead.
+ *
+ * An error is fatal for non-hotplugged devices, when the global is applied.
*/
typedef struct GlobalProperty {
const char *driver;
const char *property;
const char *value;
bool used;
- Error **errp;
} GlobalProperty;
static inline void
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index fa47f39584..5f9046b84a 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1238,8 +1238,8 @@ void qdev_prop_set_globals(DeviceState *dev)
if (err != NULL) {
error_prepend(&err, "can't apply global %s.%s=%s: ",
prop->driver, prop->property, prop->value);
- if (!dev->hotplugged && prop->errp) {
- error_propagate(prop->errp, err);
+ if (!dev->hotplugged) {
+ error_propagate(&error_fatal, err);
} else {
warn_report_err(err);
}
diff --git a/qom/cpu.c b/qom/cpu.c
index 9ad1372d57..5442a7323b 100644
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -312,7 +312,6 @@ static void cpu_common_parse_features(const char *typename,
char *features,
prop->driver = typename;
prop->property = g_strdup(featurestr);
prop->value = g_strdup(val);
- prop->errp = &error_fatal;
qdev_prop_register_global(prop);
} else {
error_setg(errp, "Expected key=value format, found %s.",
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 677a3bd5fb..fa37203d89 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -3568,7 +3568,6 @@ static void x86_cpu_parse_featurestr(const char
*typename, char *features,
prop->driver = typename;
prop->property = g_strdup(name);
prop->value = g_strdup(val);
- prop->errp = &error_fatal;
qdev_prop_register_global(prop);
}
diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
index 0f090ece54..4a4445bdf5 100644
--- a/target/sparc/cpu.c
+++ b/target/sparc/cpu.c
@@ -111,7 +111,6 @@ cpu_add_feat_as_prop(const char *typename, const char
*name, const char *val)
prop->driver = typename;
prop->property = g_strdup(name);
prop->value = g_strdup(val);
- prop->errp = &error_fatal;
qdev_prop_register_global(prop);
}
diff --git a/vl.c b/vl.c
index 18b3b5727c..03438cd886 100644
--- a/vl.c
+++ b/vl.c
@@ -2965,7 +2965,6 @@ static int global_init_func(void *opaque, QemuOpts *opts,
Error **errp)
g->driver = qemu_opt_get(opts, "driver");
g->property = qemu_opt_get(opts, "property");
g->value = qemu_opt_get(opts, "value");
- g->errp = &error_fatal;
qdev_prop_register_global(g);
return 0;
}
--
2.20.1.2.gb21ebb671b
- [Qemu-devel] [PULL 15/28] compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros, (continued)
- [Qemu-devel] [PULL 15/28] compat: replace PC_COMPAT_2_5 & HW_COMPAT_2_5 macros, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 16/28] compat: replace PC_COMPAT_2_4 & HW_COMPAT_2_4 macros, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 17/28] compat: replace PC_COMPAT_2_3 & HW_COMPAT_2_3 macros, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 19/28] compat: replace PC_COMPAT_2_1 & HW_COMPAT_2_1 macros, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 18/28] compat: replace PC_COMPAT_2_2 & HW_COMPAT_2_2 macros, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 20/28] include: remove compat.h, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 21/28] compat: remove remaining PC_COMPAT macros, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 22/28] qdev: make a separate helper function to apply compat properties, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 23/28] qdev: all globals are now user-provided, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 24/28] qdev-props: convert global_props to GPtrArray, Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 25/28] qdev-props: remove errp from GlobalProperty,
Marc-André Lureau <=
- [Qemu-devel] [PULL 26/28] qdev-props: call object_apply_global_props(), Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 27/28] arm: replace instance_post_init(), Marc-André Lureau, 2019/01/04
- [Qemu-devel] [PULL 28/28] hostmem: use object id for memory region name with >= 4.0, Marc-André Lureau, 2019/01/04
- Re: [Qemu-devel] [PULL 00/28] Machine props patches, Peter Maydell, 2019/01/07