From 8c3f45abd098e47ab4c3fd2ca7681de27d804020 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Fri, 21 Jul 2017 08:20:14 +0200 Subject: [PATCH 01/17] AArch64: remove mach-virt-7.3 machine type RH-Author: Andrew Jones Message-id: <20170721082014.31965-1-drjones@redhat.com> Patchwork-id: 75828 O-Subject: [RHEL-ALT-7.4 qemu-kvm PATCH] AArch64: remove mach-virt-7.3 machine type Bugzilla: 1473548 RH-Acked-by: Wei Huang RH-Acked-by: Auger Eric RH-Acked-by: Laszlo Ersek Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1473548 We never officially released any machine type, so we only ever want the most recent one available in our unofficial releases. Time to remove the last one again. Signed-off-by: Andrew Jones Signed-off-by: Miroslav Rezanina --- hw/arm/virt.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 82d2636..869ff18 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1793,27 +1793,3 @@ static void rhel740_virt_options(MachineClass *mc) SET_MACHINE_COMPAT(mc, ARM_RHEL_COMPAT); } DEFINE_RHEL_MACHINE_AS_LATEST(7, 4, 0) - -#define ARM_COMPAT_RHEL7_3 \ - HW_COMPAT_RHEL7_3 - -static void rhel730_virt_instance_init(Object *obj) -{ - rhel740_virt_instance_init(obj); -} - -static void rhel730_virt_options(MachineClass *mc) -{ - VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc)); - - rhel740_virt_options(mc); - SET_MACHINE_COMPAT(mc, ARM_COMPAT_RHEL7_3); - /* the following options need to be re-configured because they weren't - * present in RHEL 7.3. - */ - vmc->disallow_affinity_adjustment = true; - vmc->no_its = true; - vmc->no_pmu = true; - mc->minimum_page_bits = 0; -} -DEFINE_RHEL_MACHINE(7, 3, 0) -- 1.8.3.1