| Message ID | 20200921221045.699690-24-ehabkost@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qom: Convert some properties to class properties | expand |
On Mon, Sep 21, 2020 at 3:30 PM 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: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > Cc: Palmer Dabbelt <palmer@dabbelt.com> > Cc: Alistair Francis <Alistair.Francis@wdc.com> > Cc: Sagar Karandikar <sagark@eecs.berkeley.edu> > Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> > Cc: qemu-riscv@nongnu.org > Cc: qemu-devel@nongnu.org > --- > hw/riscv/sifive_e.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c > index 40bbf530d49..9fe0c12df64 100644 > --- a/hw/riscv/sifive_e.c > +++ b/hw/riscv/sifive_e.c > @@ -137,11 +137,6 @@ static void sifive_e_machine_instance_init(Object *obj) > SiFiveEState *s = RISCV_E_MACHINE(obj); > > s->revb = false; > - object_property_add_bool(obj, "revb", sifive_e_machine_get_revb, > - sifive_e_machine_set_revb); > - object_property_set_description(obj, "revb", > - "Set on to tell QEMU that it should model " > - "the revB HiFive1 board"); > } > > static void sifive_e_machine_class_init(ObjectClass *oc, void *data) > @@ -152,6 +147,12 @@ static void sifive_e_machine_class_init(ObjectClass *oc, void *data) > mc->init = sifive_e_machine_init; > mc->max_cpus = 1; > mc->default_cpu_type = SIFIVE_E_CPU; > + > + object_class_property_add_bool(oc, "revb", sifive_e_machine_get_revb, > + sifive_e_machine_set_revb); > + object_class_property_set_description(oc, "revb", > + "Set on to tell QEMU that it should model " > + "the revB HiFive1 board"); > } > > static const TypeInfo sifive_e_machine_typeinfo = { > -- > 2.26.2 > >
diff --git a/hw/riscv/sifive_e.c b/hw/riscv/sifive_e.c index 40bbf530d49..9fe0c12df64 100644 --- a/hw/riscv/sifive_e.c +++ b/hw/riscv/sifive_e.c @@ -137,11 +137,6 @@ static void sifive_e_machine_instance_init(Object *obj) SiFiveEState *s = RISCV_E_MACHINE(obj); s->revb = false; - object_property_add_bool(obj, "revb", sifive_e_machine_get_revb, - sifive_e_machine_set_revb); - object_property_set_description(obj, "revb", - "Set on to tell QEMU that it should model " - "the revB HiFive1 board"); } static void sifive_e_machine_class_init(ObjectClass *oc, void *data) @@ -152,6 +147,12 @@ static void sifive_e_machine_class_init(ObjectClass *oc, void *data) mc->init = sifive_e_machine_init; mc->max_cpus = 1; mc->default_cpu_type = SIFIVE_E_CPU; + + object_class_property_add_bool(oc, "revb", sifive_e_machine_get_revb, + sifive_e_machine_set_revb); + object_class_property_set_description(oc, "revb", + "Set on to tell QEMU that it should model " + "the revB HiFive1 board"); } static const TypeInfo sifive_e_machine_typeinfo = {
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: Palmer Dabbelt <palmer@dabbelt.com> Cc: Alistair Francis <Alistair.Francis@wdc.com> Cc: Sagar Karandikar <sagark@eecs.berkeley.edu> Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> Cc: qemu-riscv@nongnu.org Cc: qemu-devel@nongnu.org --- hw/riscv/sifive_e.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)