The pc_compat_3_1[] array was only used by the pc-q35-3.1
and pc-i440fx-3.1 machines, which got removed. Remove it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/i386/pc.h | 3 ---
hw/i386/pc.c | 25 -------------------------
2 files changed, 28 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 908de5e1eab..4e1dd436ab7 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -271,9 +271,6 @@ extern const size_t pc_compat_4_1_len;
extern GlobalProperty pc_compat_4_0[];
extern const size_t pc_compat_4_0_len;
-extern GlobalProperty pc_compat_3_1[];
-extern const size_t pc_compat_3_1_len;
-
#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
static void pc_machine_##suffix##_class_init(ObjectClass *oc, \
const void *data) \
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index b11afa0531c..93d1a52d712 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -189,31 +189,6 @@ const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1);
GlobalProperty pc_compat_4_0[] = {};
const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0);
-GlobalProperty pc_compat_3_1[] = {
- { "intel-iommu", "dma-drain", "off" },
- { "Opteron_G3" "-" TYPE_X86_CPU, "rdtscp", "off" },
- { "Opteron_G4" "-" TYPE_X86_CPU, "rdtscp", "off" },
- { "Opteron_G4" "-" TYPE_X86_CPU, "npt", "off" },
- { "Opteron_G4" "-" TYPE_X86_CPU, "nrip-save", "off" },
- { "Opteron_G5" "-" TYPE_X86_CPU, "rdtscp", "off" },
- { "Opteron_G5" "-" TYPE_X86_CPU, "npt", "off" },
- { "Opteron_G5" "-" TYPE_X86_CPU, "nrip-save", "off" },
- { "EPYC" "-" TYPE_X86_CPU, "npt", "off" },
- { "EPYC" "-" TYPE_X86_CPU, "nrip-save", "off" },
- { "EPYC-IBPB" "-" TYPE_X86_CPU, "npt", "off" },
- { "EPYC-IBPB" "-" TYPE_X86_CPU, "nrip-save", "off" },
- { "Skylake-Client" "-" TYPE_X86_CPU, "mpx", "on" },
- { "Skylake-Client-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },
- { "Skylake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
- { "Skylake-Server-IBRS" "-" TYPE_X86_CPU, "mpx", "on" },
- { "Cascadelake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
- { "Icelake-Client" "-" TYPE_X86_CPU, "mpx", "on" },
- { "Icelake-Server" "-" TYPE_X86_CPU, "mpx", "on" },
- { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" },
- { TYPE_X86_CPU, "x-intel-pt-auto-level", "off" },
-};
-const size_t pc_compat_3_1_len = G_N_ELEMENTS(pc_compat_3_1);
-
/*
* @PC_FW_DATA:
* Size of the chunk of memory at the top of RAM for the BIOS ACPI tables
--
2.52.0