mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qom: introduce object_register_sugar_prop

Browse Source 
Similar to the existing "-rtc driftfix" option, we will convert some
legacy "-machine" command line options to global properties on accelerators.
Because accelerators are not devices, we cannot use qdev_prop_register_global.
Instead, provide a slot in the generic object_compat_props arrays for
command line syntactic sugar.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2019-11-13 13:33:44 +01:00
parent 8b90f1c5ac
commit 1fff3c206f
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qom/object.h
View File

@ -679,6 +679,7 @@ void object_apply_global_props(Object *obj, const GPtrArray *props,
Error **errp); Error **errp);
void object_set_machine_compat_props(GPtrArray *compat_props); void object_set_machine_compat_props(GPtrArray *compat_props);
void object_set_accelerator_compat_props(GPtrArray *compat_props); void object_set_accelerator_compat_props(GPtrArray *compat_props);
void object_register_sugar_prop(const char *driver, const char *prop, const char *value);
void object_apply_compat_props(Object *obj); void object_apply_compat_props(Object *obj);
/** /**

23
qom/object.c
View File

@ -414,10 +414,29 @@ void object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp
* Global property defaults * Global property defaults
* Slot 0: accelerator's global property defaults * Slot 0: accelerator's global property defaults
* Slot 1: machine's global property defaults * Slot 1: machine's global property defaults
* Slot 2: global properties from legacy command line option
* Each is a GPtrArray of of GlobalProperty. * Each is a GPtrArray of of GlobalProperty.
* Applied in order, later entries override earlier ones. * Applied in order, later entries override earlier ones.
*/ */
static GPtrArray *object_compat_props[2]; static GPtrArray *object_compat_props[3];
/*
* Retrieve @GPtrArray for global property defined with options
* other than "-global". These are generally used for syntactic
* sugar and legacy command line options.
*/
void object_register_sugar_prop(const char *driver, const char *prop, const char *value)
{
GlobalProperty *g;
if (!object_compat_props[2]) {
object_compat_props[2] = g_ptr_array_new();
}
g = g_new0(GlobalProperty, 1);
g->driver = g_strdup(driver);
g->property = g_strdup(prop);
g->value = g_strdup(value);
g_ptr_array_add(object_compat_props[2], g);
}
/* /*
* Set machine's global property defaults to @compat_props. * Set machine's global property defaults to @compat_props.
@ -445,7 +464,7 @@ void object_apply_compat_props(Object *obj)
for (i = 0; i < ARRAY_SIZE(object_compat_props); i++) { for (i = 0; i < ARRAY_SIZE(object_compat_props); i++) {
object_apply_global_props(obj, object_compat_props[i], object_apply_global_props(obj, object_compat_props[i],
&error_abort); i == 2 ? &error_fatal : &error_abort);
} }
} }

10
vl.c
View File

@ -895,13 +895,9 @@ static void configure_rtc(QemuOpts *opts)
value = qemu_opt_get(opts, "driftfix"); value = qemu_opt_get(opts, "driftfix");
if (value) { if (value) {
if (!strcmp(value, "slew")) { if (!strcmp(value, "slew")) {
static GlobalProperty slew_lost_ticks = { object_register_sugar_prop("mc146818rtc",
.driver = "mc146818rtc", "lost_tick_policy",
.property = "lost_tick_policy", "slew");
.value = "slew",
};
qdev_prop_register_global(&slew_lost_ticks);
} else if (!strcmp(value, "none")) { } else if (!strcmp(value, "none")) {
/* discard is default */ /* discard is default */
} else { } else {