On 8 June 2016 at 19:24, Andrew Jones <drjo...@redhat.com> wrote:
> Create two variants of DEFINE_VIRT_MACHINE. One, just called
> DEFINE_VIRT_MACHINE, that does not set properties that only
> the latest machine type should have, and another that does.
> This will hopefully reduce potential for errors when adding
> new versions.
>
> Signed-off-by: Andrew Jones <drjo...@redhat.com>
> ---
> hw/arm/virt.c | 15 +++++++++++----
> 1 file changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 9a3289d2c422c..017c244a46f41 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -99,12 +99,16 @@ typedef struct {
> OBJECT_CLASS_CHECK(VirtMachineClass, klass, TYPE_VIRT_MACHINE)
>
>
> -#define DEFINE_VIRT_MACHINE(major, minor) \
> +#define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \
> static void virt_##major##_##minor##_class_init(ObjectClass *oc, void
> *data) \
> { \
> MachineClass *mc = MACHINE_CLASS(oc); \
> virt_machine_##major##_##minor##_options(mc); \
> mc->desc = "QEMU " # major "." # minor " ARM Virtual Machine"; \
> + if (latest) { \
> + mc->alias = "virt"; \
> + mc->is_default = 1; \
> + } \
See previous patch comments about not wanting a default machine.
thanks
-- PMM
