7860e3248a
- Rebase to QEMU 10.0.0 [RHEL-74473] - Resolves: RHEL-74473 (Rebase qemu-kvm to QEMU 10.0.0)
102 lines
3.2 KiB
Diff
102 lines
3.2 KiB
Diff
From af51df70a29fec7ae9e8bb64006dab26487c1a35 Mon Sep 17 00:00:00 2001
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
Date: Wed, 10 Jul 2024 02:25:51 -0400
|
|
Subject: Remove upstream machine types for aarch64, s390x and x86_64
|
|
architectures
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
We will replace upstream machine types on supported architectures with RHEL
|
|
machine types.
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
|
Rebase notes (9.1.0):
|
|
- Split off commits adding RHEL machine types
|
|
---
|
|
hw/arm/virt.c | 2 ++
|
|
hw/i386/pc_piix.c | 2 ++
|
|
hw/i386/pc_q35.c | 2 ++
|
|
hw/s390x/s390-virtio-ccw.c | 2 ++
|
|
4 files changed, 8 insertions(+)
|
|
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
index 904596ae3b..6d5ea31e46 100644
|
|
--- a/hw/arm/virt.c
|
|
+++ b/hw/arm/virt.c
|
|
@@ -3413,6 +3413,7 @@ static void machvirt_machine_init(void)
|
|
}
|
|
type_init(machvirt_machine_init);
|
|
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
static void virt_machine_10_0_options(MachineClass *mc)
|
|
{
|
|
}
|
|
@@ -3677,3 +3678,4 @@ static void virt_machine_2_6_options(MachineClass *mc)
|
|
vmc->no_pmu = true;
|
|
}
|
|
DEFINE_VIRT_MACHINE(2, 6)
|
|
+#endif /* disabled for RHEL */
|
|
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
index 6c91e2d292..1b58988c9a 100644
|
|
--- a/hw/i386/pc_piix.c
|
|
+++ b/hw/i386/pc_piix.c
|
|
@@ -452,6 +452,7 @@ static void pc_i440fx_init(MachineState *machine)
|
|
#define DEFINE_I440FX_MACHINE_AS_LATEST(major, minor) \
|
|
DEFINE_PC_VER_MACHINE(pc_i440fx, "pc-i440fx", pc_i440fx_init, true, "pc", major, minor);
|
|
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
static void pc_i440fx_machine_options(MachineClass *m)
|
|
{
|
|
PCMachineClass *pcmc = PC_MACHINE_CLASS(m);
|
|
@@ -794,6 +795,7 @@ static void pc_i440fx_machine_2_4_options(MachineClass *m)
|
|
}
|
|
|
|
DEFINE_I440FX_MACHINE(2, 4);
|
|
+#endif /* Disabled for Red Hat Enterprise Linux */
|
|
|
|
#ifdef CONFIG_ISAPC
|
|
static void isapc_machine_options(MachineClass *m)
|
|
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
index fd96d0345c..97a40a3a9c 100644
|
|
--- a/hw/i386/pc_q35.c
|
|
+++ b/hw/i386/pc_q35.c
|
|
@@ -361,6 +361,7 @@ static void pc_q35_machine_options(MachineClass *m)
|
|
pc_q35_compat_defaults, pc_q35_compat_defaults_len);
|
|
}
|
|
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
static void pc_q35_machine_10_0_options(MachineClass *m)
|
|
{
|
|
pc_q35_machine_options(m);
|
|
@@ -689,3 +690,4 @@ static void pc_q35_machine_2_4_options(MachineClass *m)
|
|
}
|
|
|
|
DEFINE_Q35_MACHINE(2, 4);
|
|
+#endif /* Disabled for Red Hat Enterprise Linux */
|
|
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
|
|
index 75b32182eb..5aa5910399 100644
|
|
--- a/hw/s390x/s390-virtio-ccw.c
|
|
+++ b/hw/s390x/s390-virtio-ccw.c
|
|
@@ -921,6 +921,7 @@ static const TypeInfo ccw_machine_info = {
|
|
DEFINE_CCW_MACHINE_IMPL(false, major, minor)
|
|
|
|
|
|
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
static void ccw_machine_10_0_instance_options(MachineState *machine)
|
|
{
|
|
}
|
|
@@ -1295,6 +1296,7 @@ static void ccw_machine_2_9_class_options(MachineClass *mc)
|
|
DEFINE_CCW_MACHINE(2, 9);
|
|
|
|
#endif
|
|
+#endif /* disabled for RHEL */
|
|
|
|
static void ccw_machine_register_types(void)
|
|
{
|
|
--
|
|
2.39.3
|
|
|