Message ID | 1502106581-11714-1-git-send-email-eric.auger@redhat.com |
---|---|
State | New |
Headers | show |
On Mon, Aug 07, 2017 at 11:49:41AM +0000, Eric Auger wrote: > Add virt-2.10 machine type. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > > --- > --- > hw/arm/virt.c | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 31739d7..6b7a0fe 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1639,7 +1639,7 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > -static void virt_2_9_instance_init(Object *obj) > +static void virt_2_10_instance_init(Object *obj) > { > VirtMachineState *vms = VIRT_MACHINE(obj); > VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); > @@ -1699,10 +1699,25 @@ static void virt_2_9_instance_init(Object *obj) > vms->irqmap = a15irqmap; > } > > +static void virt_machine_2_10_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(2, 10) > + > +#define VIRT_COMPAT_2_9 \ > + HW_COMPAT_2_9 > + > +static void virt_2_9_instance_init(Object *obj) > +{ > + virt_2_10_instance_init(obj); > +} > + > static void virt_machine_2_9_options(MachineClass *mc) > { > + virt_machine_2_10_options(mc); > + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_9); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(2, 9) > +DEFINE_VIRT_MACHINE(2, 9) > > #define VIRT_COMPAT_2_8 \ > HW_COMPAT_2_8 > -- > 1.9.1 > > Reviewed-by: Andrew Jones <drjones@redhat.com>
On 7 August 2017 at 13:14, Andrew Jones <drjones@redhat.com> wrote: > On Mon, Aug 07, 2017 at 11:49:41AM +0000, Eric Auger wrote: >> Add virt-2.10 machine type. >> >> Signed-off-by: Eric Auger <eric.auger@redhat.com> >> >> --- Applied to master, thanks. -- PMM
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 31739d7..6b7a0fe 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1639,7 +1639,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -static void virt_2_9_instance_init(Object *obj) +static void virt_2_10_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); @@ -1699,10 +1699,25 @@ static void virt_2_9_instance_init(Object *obj) vms->irqmap = a15irqmap; } +static void virt_machine_2_10_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(2, 10) + +#define VIRT_COMPAT_2_9 \ + HW_COMPAT_2_9 + +static void virt_2_9_instance_init(Object *obj) +{ + virt_2_10_instance_init(obj); +} + static void virt_machine_2_9_options(MachineClass *mc) { + virt_machine_2_10_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_9); } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 9) +DEFINE_VIRT_MACHINE(2, 9) #define VIRT_COMPAT_2_8 \ HW_COMPAT_2_8
Add virt-2.10 machine type. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- --- hw/arm/virt.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)