Message ID | 20200921221045.699690-9-ehabkost@redhat.com |
---|---|
State | Accepted |
Commit | fdfe5ba4a88ee67e2d9fbb3af3d9de2163d349d9 |
Headers | show |
Series | qom: Convert some properties to class properties | expand |
On Mon, 21 Sep 2020 18:10:29 -0400 Eduardo Habkost <ehabkost@redhat.com> wrote: > Class properties make QOM introspection simpler and easier, as > they don't require an object to be instantiated. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > Cc: Peter Maydell <peter.maydell@linaro.org> > Cc: qemu-arm@nongnu.org > Cc: qemu-devel@nongnu.org > --- > hw/arm/vexpress.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c > index 0cc35749d7d..13339302af5 100644 > --- a/hw/arm/vexpress.c > +++ b/hw/arm/vexpress.c > @@ -769,12 +769,6 @@ static void vexpress_a15_instance_init(Object *obj) > * but can also be specifically set to on or off. > */ > vms->virt = true; > - object_property_add_bool(obj, "virtualization", vexpress_get_virt, > - vexpress_set_virt); > - object_property_set_description(obj, "virtualization", > - "Set on/off to enable/disable the ARM " > - "Virtualization Extensions " > - "(defaults to same as 'secure')"); > } > > static void vexpress_a9_instance_init(Object *obj) > @@ -822,6 +816,14 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data) > mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"); > > vmc->daughterboard = &a15_daughterboard; > + > + object_class_property_add_bool(oc, "virtualization", vexpress_get_virt, > + vexpress_set_virt); > + object_class_property_set_description(oc, "virtualization", > + "Set on/off to enable/disable the ARM " > + "Virtualization Extensions " > + "(defaults to same as 'secure')"); > + > } > > static const TypeInfo vexpress_info = {
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index 0cc35749d7d..13339302af5 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -769,12 +769,6 @@ static void vexpress_a15_instance_init(Object *obj) * but can also be specifically set to on or off. */ vms->virt = true; - object_property_add_bool(obj, "virtualization", vexpress_get_virt, - vexpress_set_virt); - object_property_set_description(obj, "virtualization", - "Set on/off to enable/disable the ARM " - "Virtualization Extensions " - "(defaults to same as 'secure')"); } static void vexpress_a9_instance_init(Object *obj) @@ -822,6 +816,14 @@ static void vexpress_a15_class_init(ObjectClass *oc, void *data) mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-a15"); vmc->daughterboard = &a15_daughterboard; + + object_class_property_add_bool(oc, "virtualization", vexpress_get_virt, + vexpress_set_virt); + object_class_property_set_description(oc, "virtualization", + "Set on/off to enable/disable the ARM " + "Virtualization Extensions " + "(defaults to same as 'secure')"); + } static const TypeInfo vexpress_info = {
Class properties make QOM introspection simpler and easier, as they don't require an object to be instantiated. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- Cc: Peter Maydell <peter.maydell@linaro.org> Cc: qemu-arm@nongnu.org Cc: qemu-devel@nongnu.org --- hw/arm/vexpress.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)