From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVcq9-0004Xs-2C for qemu-devel@nongnu.org; Wed, 20 Jun 2018 09:08:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVcq4-0005jO-SY for qemu-devel@nongnu.org; Wed, 20 Jun 2018 09:08:01 -0400 From: Eric Auger Date: Wed, 20 Jun 2018 15:07:31 +0200 Message-Id: <1529500053-21704-5-git-send-email-eric.auger@redhat.com> In-Reply-To: <1529500053-21704-1-git-send-email-eric.auger@redhat.com> References: <1529500053-21704-1-git-send-email-eric.auger@redhat.com> Subject: [Qemu-devel] [RFC 4/6] hw/arm/virt: Add virt-3.0 machine type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org Cc: dgilbert@redhat.com, agraf@suse.de, david@gibson.dropbear.id.au, drjones@redhat.com, wei@redhat.com, suzuki.poulose@arm.com Add virt-3.0 machine type. Signed-off-by: Eric Auger --- Due to the kernel dependency, virt 3.1 will be targetted instead. --- hw/arm/virt.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f0a4fa0..dd92ab9 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1692,10 +1692,7 @@ static void machvirt_machine_init(void) } type_init(machvirt_machine_init); -#define VIRT_COMPAT_2_12 \ - HW_COMPAT_2_12 - -static void virt_2_12_instance_init(Object *obj) +static void virt_3_0_instance_init(Object *obj) { VirtMachineState *vms = VIRT_MACHINE(obj); VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); @@ -1763,11 +1760,25 @@ static void virt_2_12_instance_init(Object *obj) vms->irqmap = a15irqmap; } +static void virt_machine_3_0_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE_AS_LATEST(3, 0) + +#define VIRT_COMPAT_2_12 \ + HW_COMPAT_2_12 + +static void virt_2_12_instance_init(Object *obj) +{ + virt_3_0_instance_init(obj); +} + static void virt_machine_2_12_options(MachineClass *mc) { + virt_machine_3_0_options(mc); SET_MACHINE_COMPAT(mc, VIRT_COMPAT_2_12); } -DEFINE_VIRT_MACHINE_AS_LATEST(2, 12) +DEFINE_VIRT_MACHINE(2, 12) #define VIRT_COMPAT_2_11 \ HW_COMPAT_2_11 -- 2.5.5