[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 43/49] hw/i386/pc: Unexport PC_CPU_MODEL_IDS macro
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 43/49] hw/i386/pc: Unexport PC_CPU_MODEL_IDS macro |
Date: |
Sat, 11 Jun 2022 12:33:06 +0200 |
From: Bernhard Beschow <shentey@gmail.com>
The macro seems to be used only internally, so remove it.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Message-Id: <20220520180109.8224-4-shentey@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/i386/pc.c | 9 +++++++++
include/hw/i386/pc.h | 8 --------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index af9e5edb04..272d7227d5 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -98,6 +98,15 @@
#include "trace.h"
#include CONFIG_DEVICES
+/*
+ * Helper for setting model-id for CPU models that changed model-id
+ * depending on QEMU versions up to QEMU 2.4.
+ */
+#define PC_CPU_MODEL_IDS(v) \
+ { "qemu32-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
+ { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
+ { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
+
GlobalProperty pc_compat_7_0[] = {};
const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0);
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 003a86b721..b58ac343ba 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -288,14 +288,6 @@ extern const size_t pc_compat_1_5_len;
extern GlobalProperty pc_compat_1_4[];
extern const size_t pc_compat_1_4_len;
-/* Helper for setting model-id for CPU models that changed model-id
- * depending on QEMU versions up to QEMU 2.4.
- */
-#define PC_CPU_MODEL_IDS(v) \
- { "qemu32-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
- { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
- { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
-
#define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \
static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \
{ \
--
2.36.1
- [PULL 36/49] hw/isa/piix3: Factor out ISABus retrieval from piix3_create(), (continued)
- [PULL 36/49] hw/isa/piix3: Factor out ISABus retrieval from piix3_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 33/49] hw/isa/piix4: Inline and remove piix4_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 37/49] hw/isa/piix3: Inline and remove piix3_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 35/49] hw/isa/piix3: QOM'ify PCI device creation and wiring, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 38/49] hw/i386/microvm-dt: Force explicit failure if retrieving QOM property fails, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 39/49] hw/i386/microvm-dt: Determine mc146818rtc's IRQ number from QOM property, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 40/49] hw/rtc/mc146818rtc: QOM'ify io_base offset, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 44/49] hw/i386/pc: Unexport functions used only internally, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 41/49] hw: Reuse TYPE_I8042 define, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 42/49] hw/audio/cs4231a: Const'ify global tables, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 43/49] hw/i386/pc: Unexport PC_CPU_MODEL_IDS macro,
Philippe Mathieu-Daudé <=
- [PULL 47/49] accel/tcg/cpu-exec: Unexport dump_drift_info(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 46/49] hw/net/fsl_etsec/etsec: Remove obsolete and unused etsec_create(), Philippe Mathieu-Daudé, 2022/06/11
- [PULL 48/49] accel/tcg: Inline dump_opcount_info() and remove it, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 45/49] hw/i386/pc: Remove orphan declarations, Philippe Mathieu-Daudé, 2022/06/11
- [PULL 49/49] docs/devel: Fix link to developer mailing lists, Philippe Mathieu-Daudé, 2022/06/11
- Re: [PULL 00/49] MIPS patches for 2022-06-11, Philippe Mathieu-Daudé, 2022/06/11
- Re: [PULL 00/49] MIPS patches for 2022-06-11, Richard Henderson, 2022/06/11