Commit 3356ebce authored by Andrew Jones's avatar Andrew Jones Committed by Peter Maydell
Browse files

hw/arm/virt: introduce DEFINE_VIRT_MACHINE_AS_LATEST 



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: default avatarAndrew Jones <drjones@redhat.com>
Message-id: 1465746713-30414-4-git-send-email-drjones@redhat.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent ab093c3c

hw/arm/virt.c

+10 −3
Original line number Diff line number Diff line
@@ -99,13 +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"; \

        } \

    } \

    static const TypeInfo machvirt_##major##_##minor##_info = { \

        .name = MACHINE_TYPE_NAME("virt-" # major "." # minor), \
@@ -119,6 +122,11 @@ typedef struct { 
    } \

    type_init(machvirt_machine_##major##_##minor##_init);



#define DEFINE_VIRT_MACHINE_AS_LATEST(major, minor) \

    DEFINE_VIRT_MACHINE_LATEST(major, minor, true)

#define DEFINE_VIRT_MACHINE(major, minor) \

    DEFINE_VIRT_MACHINE_LATEST(major, minor, false)





/* RAM limit in GB. Since VIRT_MEM starts at the 1GB mark, this means

 * RAM can go up to the 256GB mark, leaving 256GB of the physical
@@ -1483,6 +1491,5 @@ static void virt_2_6_instance_init(Object *obj) 


static void virt_machine_2_6_options(MachineClass *mc)

{

    mc->alias = "virt";

}

DEFINE_VIRT_MACHINE(2, 6)
 
DEFINE_VIRT_MACHINE_AS_LATEST(2, 6)