| Message ID | 1481301020-21777-2-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Dec 09, 2016 at 04:30:17PM +0000, Peter Maydell wrote: > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > include/hw/compat.h | 3 +++ > hw/arm/virt.c | 19 +++++++++++++++++-- > 2 files changed, 20 insertions(+), 2 deletions(-) Reviewed-by: Andrew Jones <drjones@redhat.com> > > diff --git a/include/hw/compat.h b/include/hw/compat.h > index 0f06e11..f8b8354 100644 > --- a/include/hw/compat.h > +++ b/include/hw/compat.h > @@ -1,6 +1,9 @@ > #ifndef HW_COMPAT_H > #define HW_COMPAT_H > > +#define HW_COMPAT_2_8 \ > + /* empty */ > + > #define HW_COMPAT_2_7 \ > {\ > .driver = "virtio-pci",\ > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index d04e4ac..11c53a5 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1525,7 +1525,7 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > -static void virt_2_8_instance_init(Object *obj) > +static void virt_2_9_instance_init(Object *obj) > { > VirtMachineState *vms = VIRT_MACHINE(obj); > > @@ -1558,10 +1558,25 @@ static void virt_2_8_instance_init(Object *obj) > "Valid values are 2, 3 and host", NULL); > } > > +static void virt_machine_2_9_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(2, 9) > + > +#define VIRT_COMPAT_2_8 \ > + HW_COMPAT_2_8 > + > +static void virt_2_8_instance_init(Object *obj) > +{ > + virt_2_9_instance_init(obj); > +} > + > static void virt_machine_2_8_options(MachineClass *mc) > { > + virt_machine_2_9_options(mc); > + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_8); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(2, 8) > +DEFINE_VIRT_MACHINE(2, 8) > > #define VIRT_COMPAT_2_7 \ > HW_COMPAT_2_7 > -- > 2.7.4 >
diff --git a/include/hw/compat.h b/include/hw/compat.h index 0f06e11..f8b8354 100644 --- a/include/hw/compat.h +++ b/include/hw/compat.h @@ -1,6 +1,9 @@ #ifndef HW_COMPAT_H #define HW_COMPAT_H +#define HW_COMPAT_2_8 \ + /* empty */ + #define HW_COMPAT_2_7 \ {\ .driver = "virtio-pci",\ diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d04e4ac..11c53a5 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1525,7 +1525,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -static void virt_2_8_instance_init(Object *obj) +static void virt_2_9_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); @@ -1558,10 +1558,25 @@ static void virt_2_8_instance_init(Object *obj) "Valid values are 2, 3 and host", NULL); } +static void virt_machine_2_9_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(2, 9) + +#define VIRT_COMPAT_2_8 \ + HW_COMPAT_2_8 + +static void virt_2_8_instance_init(Object *obj) +{ + virt_2_9_instance_init(obj); +} + static void virt_machine_2_8_options(MachineClass *mc) { + virt_machine_2_9_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_8); } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 8) +DEFINE_VIRT_MACHINE(2, 8) #define VIRT_COMPAT_2_7 \ HW_COMPAT_2_7
Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- include/hw/compat.h | 3 +++ hw/arm/virt.c | 19 +++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)