From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAiAC-0003zY-V4 for qemu-devel@nongnu.org; Wed, 08 Jun 2016 14:25:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAiAC-0008S1-2r for qemu-devel@nongnu.org; Wed, 08 Jun 2016 14:25:12 -0400 From: Andrew Jones Date: Wed, 8 Jun 2016 20:24:51 +0200 Message-Id: <1465410291-2971-6-git-send-email-drjones@redhat.com> In-Reply-To: <1465410291-2971-1-git-send-email-drjones@redhat.com> References: <1465410291-2971-1-git-send-email-drjones@redhat.com> Subject: [Qemu-devel] [PATCH 5/5] hw/arm/virt: create the 2.7 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: peter.maydell@linaro.org, wei@redhat.com Signed-off-by: Andrew Jones --- hw/arm/virt.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 017c244a46f41..323ffd4689641 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -42,6 +42,7 @@ #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "hw/boards.h" +#include "hw/compat.h" #include "hw/loader.h" #include "exec/address-spaces.h" #include "qemu/bitops.h" @@ -1423,7 +1424,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -static void virt_2_6_instance_init(Object *obj) +static void virt_2_7_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); @@ -1456,7 +1457,22 @@ static void virt_2_6_instance_init(Object *obj) "Valid values are 2, 3 and host", NULL); } +static void virt_machine_2_7_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(2, 7) + +#define VIRT_COMPAT_2_6 \ + HW_COMPAT_2_6 + +static void virt_2_6_instance_init(Object *obj) +{ + virt_2_7_instance_init(obj); +} + static void virt_machine_2_6_options(MachineClass *mc) { + virt_machine_2_7_options(mc); + SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_6); } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 6) +DEFINE_VIRT_MACHINE(2, 6) -- 2.4.11