| Message ID | 1511516626-21178-1-git-send-email-eric.auger@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [for,2.11] hw/arm/virt: Add 2.11 machine type | expand |
On 24 November 2017 at 09:43, Eric Auger <eric.auger@redhat.com> wrote: > Add virt-2.11 machine type. > > Signed-off-by: Eric Auger <eric.auger@redhat.com> > > --- Argh, did we forget this again? I think we should just make a rule that we have to bump all the versioned machine types when the dev tree reopens...I wonder if there's a way to catch this automatically? thanks -- PMM
Hi Peter, On 24/11/17 11:11, Peter Maydell wrote: > On 24 November 2017 at 09:43, Eric Auger <eric.auger@redhat.com> wrote: >> Add virt-2.11 machine type. >> >> Signed-off-by: Eric Auger <eric.auger@redhat.com> >> >> --- > > Argh, did we forget this again? Yes we did, please apologize for that. I think we should just > make a rule that we have to bump all the versioned machine > types when the dev tree reopens... I can take this in charge in the future. Thanks Eric I wonder if there's a > way to catch this automatically? > > thanks > -- PMM >
On 24 November 2017 at 10:16, Auger Eric <eric.auger@redhat.com> wrote: > Hi Peter, > > On 24/11/17 11:11, Peter Maydell wrote: >> On 24 November 2017 at 09:43, Eric Auger <eric.auger@redhat.com> wrote: >>> Add virt-2.11 machine type. >>> >>> Signed-off-by: Eric Auger <eric.auger@redhat.com> >>> >>> --- >> >> Argh, did we forget this again? > > Yes we did, please apologize for that. Sorry :-) I've now applied this to master. -- PMM
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9e18b41..151592b 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1618,7 +1618,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -static void virt_2_10_instance_init(Object *obj) +static void virt_2_11_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); @@ -1678,10 +1678,25 @@ static void virt_2_10_instance_init(Object *obj) vms->irqmap = a15irqmap; } +static void virt_machine_2_11_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(2, 11) + +#define VIRT_COMPAT_2_10 \ + HW_COMPAT_2_10 + +static void virt_2_10_instance_init(Object *obj) +{ + virt_2_11_instance_init(obj); +} + static void virt_machine_2_10_options(MachineClass *mc) { + virt_machine_2_11_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_10); } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 10) +DEFINE_VIRT_MACHINE(2, 10) #define VIRT_COMPAT_2_9 \ HW_COMPAT_2_9
Add virt-2.11 machine type. Signed-off-by: Eric Auger <eric.auger@redhat.com> --- --- hw/arm/virt.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)