From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42542) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCp6a-0003K3-OJ for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:14:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCp6Y-00080l-FW for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:14:11 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:57708) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCp6Y-00080D-8b for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:14:10 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bCp6X-0006ED-QF for qemu-devel@nongnu.org; Tue, 14 Jun 2016 15:14:09 +0100 From: Peter Maydell Date: Tue, 14 Jun 2016 15:13:43 +0100 Message-Id: <1465913645-19346-9-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1465913645-19346-1-git-send-email-peter.maydell@linaro.org> References: <1465913645-19346-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PULL 08/30] 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 From: Andrew Jones Signed-off-by: Andrew Jones Message-id: 1465746713-30414-5-git-send-email-drjones@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- 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 fb032e8..c5c125e 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" @@ -1456,7 +1457,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); @@ -1489,7 +1490,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) -- 1.9.1