| Message ID | 20200921221045.699690-25-ehabkost@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | qom: Convert some properties to class properties | expand |
On Mon, Sep 21, 2020 at 3:21 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_u.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index 4f12a93188d..0f0fab9a47b 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -568,14 +568,6 @@ static void sifive_u_machine_instance_init(Object *obj) > SiFiveUState *s = RISCV_U_MACHINE(obj); > > s->start_in_flash = false; > - object_property_add_bool(obj, "start-in-flash", > - sifive_u_machine_get_start_in_flash, > - sifive_u_machine_set_start_in_flash); > - object_property_set_description(obj, "start-in-flash", > - "Set on to tell QEMU's ROM to jump to " > - "flash. Otherwise QEMU will jump to DRAM " > - "or L2LIM depending on the msel value"); > - > s->msel = 0; > object_property_add(obj, "msel", "uint32", > sifive_u_machine_get_uint32_prop, > @@ -599,6 +591,14 @@ static void sifive_u_machine_class_init(ObjectClass *oc, void *data) > mc->max_cpus = SIFIVE_U_MANAGEMENT_CPU_COUNT + SIFIVE_U_COMPUTE_CPU_COUNT; > mc->min_cpus = SIFIVE_U_MANAGEMENT_CPU_COUNT + 1; > mc->default_cpus = mc->min_cpus; > + > + object_class_property_add_bool(oc, "start-in-flash", > + sifive_u_machine_get_start_in_flash, > + sifive_u_machine_set_start_in_flash); > + object_class_property_set_description(oc, "start-in-flash", > + "Set on to tell QEMU's ROM to jump to " > + "flash. Otherwise QEMU will jump to DRAM " > + "or L2LIM depending on the msel value"); > } > > static const TypeInfo sifive_u_machine_typeinfo = { > -- > 2.26.2 > >
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 4f12a93188d..0f0fab9a47b 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -568,14 +568,6 @@ static void sifive_u_machine_instance_init(Object *obj) SiFiveUState *s = RISCV_U_MACHINE(obj); s->start_in_flash = false; - object_property_add_bool(obj, "start-in-flash", - sifive_u_machine_get_start_in_flash, - sifive_u_machine_set_start_in_flash); - object_property_set_description(obj, "start-in-flash", - "Set on to tell QEMU's ROM to jump to " - "flash. Otherwise QEMU will jump to DRAM " - "or L2LIM depending on the msel value"); - s->msel = 0; object_property_add(obj, "msel", "uint32", sifive_u_machine_get_uint32_prop, @@ -599,6 +591,14 @@ static void sifive_u_machine_class_init(ObjectClass *oc, void *data) mc->max_cpus = SIFIVE_U_MANAGEMENT_CPU_COUNT + SIFIVE_U_COMPUTE_CPU_COUNT; mc->min_cpus = SIFIVE_U_MANAGEMENT_CPU_COUNT + 1; mc->default_cpus = mc->min_cpus; + + object_class_property_add_bool(oc, "start-in-flash", + sifive_u_machine_get_start_in_flash, + sifive_u_machine_set_start_in_flash); + object_class_property_set_description(oc, "start-in-flash", + "Set on to tell QEMU's ROM to jump to " + "flash. Otherwise QEMU will jump to DRAM " + "or L2LIM depending on the msel value"); } static const TypeInfo sifive_u_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_u.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)