[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/18] vl: introduce object_parse_property_opt
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 07/18] vl: introduce object_parse_property_opt |
Date: |
Mon, 9 Dec 2019 16:01:34 +0100 |
We will reuse the parsing loop of machine_set_property soon for "-accel",
but we do not want the "_" -> "-" conversion since "-accel" can just
standardize on dashes. We will also add a bunch of legacy option handling
to keep the QOM machine object clean. Extract the loop into a separate
function, and keep the legacy handling in machine_set_property.
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/vl.c b/vl.c
index 19c77b4..66dff1b 100644
--- a/vl.c
+++ b/vl.c
@@ -2615,27 +2615,17 @@ static MachineClass *select_machine(void)
return machine_class;
}
-static int machine_set_property(void *opaque,
- const char *name, const char *value,
- Error **errp)
+static int object_parse_property_opt(Object *obj,
+ const char *name, const char *value,
+ const char *skip, Error **errp)
{
- Object *obj = OBJECT(opaque);
Error *local_err = NULL;
- char *p, *qom_name;
- if (strcmp(name, "type") == 0) {
+ if (g_str_equal(name, skip)) {
return 0;
}
- qom_name = g_strdup(name);
- for (p = qom_name; *p; p++) {
- if (*p == '_') {
- *p = '-';
- }
- }
-
- object_property_parse(obj, value, qom_name, &local_err);
- g_free(qom_name);
+ object_property_parse(obj, value, name, &local_err);
if (local_err) {
error_propagate(errp, local_err);
@@ -2645,6 +2635,21 @@ static int machine_set_property(void *opaque,
return 0;
}
+static int machine_set_property(void *opaque,
+ const char *name, const char *value,
+ Error **errp)
+{
+ g_autofree char *qom_name = g_strdup(name);
+ char *p;
+
+ for (p = qom_name; *p; p++) {
+ if (*p == '_') {
+ *p = '-';
+ }
+ }
+
+ return object_parse_property_opt(opaque, name, value, "type", errp);
+}
/*
* Initial object creation happens before all other
--
1.8.3.1
- Re: [PATCH v2 03/18] tcg: move qemu_tcg_configure to accel/tcg/tcg-all.c, (continued)
- [PATCH v2 06/18] accel: compile accel/accel.c just once, Paolo Bonzini, 2019/12/09
- [PATCH v2 09/18] vl: warn for unavailable accelerators, clarify messages, Paolo Bonzini, 2019/12/09
- [PATCH v2 11/18] qom: add object_new_with_class, Paolo Bonzini, 2019/12/09
- [PATCH v2 08/18] vl: configure accelerators from -accel options, Paolo Bonzini, 2019/12/09
- [PATCH v2 12/18] accel: pass object to accel_init_machine, Paolo Bonzini, 2019/12/09
- [PATCH v2 07/18] vl: introduce object_parse_property_opt,
Paolo Bonzini <=
- [PATCH v2 13/18] tcg: convert "-accel threads" to a QOM property, Paolo Bonzini, 2019/12/09
- [PATCH v2 10/18] qom: introduce object_register_sugar_prop, Paolo Bonzini, 2019/12/09
- [PATCH v2 14/18] tcg: add "-accel tcg, tb-size" and deprecate "-tb-size", Paolo Bonzini, 2019/12/09
- [PATCH v2 15/18] xen: convert "-machine igd-passthru" to an accelerator property, Paolo Bonzini, 2019/12/09