Message ID | 20180704124923.32483-2-drjones@redhat.com |
---|---|
State | New |
Headers | show |
Series | hw/arm/virt: Introduce cpu topology support | expand |
On Wed, 4 Jul 2018 14:49:18 +0200 Andrew Jones <drjones@redhat.com> wrote: > Signed-off-by: Andrew Jones <drjones@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/arm/virt.c | 21 ++++++++++++++++----- > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 281ddcdf6e26..880441275031 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1757,10 +1757,7 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > -#define VIRT_COMPAT_2_12 \ > - HW_COMPAT_2_12 > - > -static void virt_3_0_instance_init(Object *obj) > +static void virt_3_1_instance_init(Object *obj) > { > VirtMachineState *vms = VIRT_MACHINE(obj); > VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); > @@ -1830,10 +1827,24 @@ static void virt_3_0_instance_init(Object *obj) > vms->irqmap = a15irqmap; > } > > +static void virt_machine_3_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(3, 1) > + > +static void virt_3_0_instance_init(Object *obj) > +{ > + virt_3_1_instance_init(obj); > +} > + > static void virt_machine_3_0_options(MachineClass *mc) > { > + virt_machine_3_1_options(mc); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(3, 0) > +DEFINE_VIRT_MACHINE(3, 0) > + > +#define VIRT_COMPAT_2_12 \ > + HW_COMPAT_2_12 > > static void virt_2_12_instance_init(Object *obj) > {
On 23 July 2018 at 13:22, Igor Mammedov <imammedo@redhat.com> wrote: > On Wed, 4 Jul 2018 14:49:18 +0200 > Andrew Jones <drjones@redhat.com> wrote: > >> Signed-off-by: Andrew Jones <drjones@redhat.com> > > Reviewed-by: Igor Mammedov <imammedo@redhat.com> We're going to want a virt-3.1 machine anyway, so I'm going to take just this patch from this series and apply it to target-arm.next. thanks -- PMM
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 281ddcdf6e26..880441275031 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1757,10 +1757,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -#define VIRT_COMPAT_2_12 \ - HW_COMPAT_2_12 - -static void virt_3_0_instance_init(Object *obj) +static void virt_3_1_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); @@ -1830,10 +1827,24 @@ static void virt_3_0_instance_init(Object *obj) vms->irqmap = a15irqmap; } +static void virt_machine_3_1_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(3, 1) + +static void virt_3_0_instance_init(Object *obj) +{ + virt_3_1_instance_init(obj); +} + static void virt_machine_3_0_options(MachineClass *mc) { + virt_machine_3_1_options(mc); } -DEFINE_VIRT_MACHINE_AS_LATEST(3, 0) +DEFINE_VIRT_MACHINE(3, 0) + +#define VIRT_COMPAT_2_12 \ + HW_COMPAT_2_12 static void virt_2_12_instance_init(Object *obj) {
Signed-off-by: Andrew Jones <drjones@redhat.com> --- hw/arm/virt.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-)