| Message ID | 20201204054415.579042-2-david@gibson.dropbear.id.au (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Generalize memory encryption models | expand |
On Fri, 4 Dec 2020 16:44:03 +1100 David Gibson <david@gibson.dropbear.id.au> wrote: > From: Greg Kurz <groug@kaod.org> > > Global properties have an @optional field, which allows to apply a given > property to a given type even if one of its subclasses doesn't support > it. This is especially used in the compat code when dealing with the > "disable-modern" and "disable-legacy" properties and the "virtio-pci" > type. > > Allow object_register_sugar_prop() to set this field as well. > > Signed-off-by: Greg Kurz <groug@kaod.org> > Message-Id: <159738953558.377274.16617742952571083440.stgit@bahia.lan> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > include/qom/object.h | 3 ++- > qom/object.c | 4 +++- > softmmu/vl.c | 16 ++++++++++------ > 3 files changed, 15 insertions(+), 8 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
On Fri, Dec 04, 2020 at 04:44:03PM +1100, David Gibson wrote: > From: Greg Kurz <groug@kaod.org> > > Global properties have an @optional field, which allows to apply a given > property to a given type even if one of its subclasses doesn't support > it. This is especially used in the compat code when dealing with the > "disable-modern" and "disable-legacy" properties and the "virtio-pci" > type. > > Allow object_register_sugar_prop() to set this field as well. > > Signed-off-by: Greg Kurz <groug@kaod.org> > Message-Id: <159738953558.377274.16617742952571083440.stgit@bahia.lan> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
On 12/4/20 6:44 AM, David Gibson wrote: > From: Greg Kurz <groug@kaod.org> > > Global properties have an @optional field, which allows to apply a given > property to a given type even if one of its subclasses doesn't support > it. This is especially used in the compat code when dealing with the > "disable-modern" and "disable-legacy" properties and the "virtio-pci" > type. > > Allow object_register_sugar_prop() to set this field as well. > > Signed-off-by: Greg Kurz <groug@kaod.org> > Message-Id: <159738953558.377274.16617742952571083440.stgit@bahia.lan> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au> > --- > include/qom/object.h | 3 ++- > qom/object.c | 4 +++- > softmmu/vl.c | 16 ++++++++++------ > 3 files changed, 15 insertions(+), 8 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/include/qom/object.h b/include/qom/object.h index d378f13a11..6721cd312e 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -638,7 +638,8 @@ bool object_apply_global_props(Object *obj, const GPtrArray *props, Error **errp); void object_set_machine_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_register_sugar_prop(const char *driver, const char *prop, + const char *value, bool optional); void object_apply_compat_props(Object *obj); /** diff --git a/qom/object.c b/qom/object.c index 1065355233..62218bb17d 100644 --- a/qom/object.c +++ b/qom/object.c @@ -442,7 +442,8 @@ static GPtrArray *object_compat_props[3]; * 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) +void object_register_sugar_prop(const char *driver, const char *prop, + const char *value, bool optional) { GlobalProperty *g; if (!object_compat_props[2]) { @@ -452,6 +453,7 @@ void object_register_sugar_prop(const char *driver, const char *prop, const char g->driver = g_strdup(driver); g->property = g_strdup(prop); g->value = g_strdup(value); + g->optional = optional; g_ptr_array_add(object_compat_props[2], g); } diff --git a/softmmu/vl.c b/softmmu/vl.c index e6e0ad5a92..cf4a9dc198 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -884,7 +884,7 @@ static void configure_rtc(QemuOpts *opts) if (!strcmp(value, "slew")) { object_register_sugar_prop("mc146818rtc", "lost_tick_policy", - "slew"); + "slew", false); } else if (!strcmp(value, "none")) { /* discard is default */ } else { @@ -2498,12 +2498,14 @@ static int machine_set_property(void *opaque, return 0; } if (g_str_equal(qom_name, "igd-passthru")) { - object_register_sugar_prop(ACCEL_CLASS_NAME("xen"), qom_name, value); + object_register_sugar_prop(ACCEL_CLASS_NAME("xen"), qom_name, value, + false); return 0; } if (g_str_equal(qom_name, "kvm-shadow-mem") || g_str_equal(qom_name, "kernel-irqchip")) { - object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), qom_name, value); + object_register_sugar_prop(ACCEL_CLASS_NAME("kvm"), qom_name, value, + false); return 0; } @@ -3645,7 +3647,8 @@ void qemu_init(int argc, char **argv, char **envp) exit(1); #endif warn_report("The -tb-size option is deprecated, use -accel tcg,tb-size instead"); - object_register_sugar_prop(ACCEL_CLASS_NAME("tcg"), "tb-size", optarg); + object_register_sugar_prop(ACCEL_CLASS_NAME("tcg"), "tb-size", + optarg, false); break; case QEMU_OPTION_icount: icount_opts = qemu_opts_parse_noisily(qemu_find_opts("icount"), @@ -3996,9 +3999,10 @@ void qemu_init(int argc, char **argv, char **envp) char *val; val = g_strdup_printf("%d", current_machine->smp.cpus); - object_register_sugar_prop("memory-backend", "prealloc-threads", val); + object_register_sugar_prop("memory-backend", "prealloc-threads", val, + false); g_free(val); - object_register_sugar_prop("memory-backend", "prealloc", "on"); + object_register_sugar_prop("memory-backend", "prealloc", "on", false); } /*