|
 |
218e99 |
commit ffacd352a92751dab005eaa1892676a91e788a10
|
|
|
218e99 |
Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
218e99 |
Date: Thu Jun 27 15:57:41 2013 +0200
|
|
|
218e99 |
|
|
|
218e99 |
pc: Replace upstream machine types by RHEL-7 types
|
|
|
218e99 |
|
|
|
218e99 |
RH-Author: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
218e99 |
Message-id: <1372348663-1706-2-git-send-email-ehabkost@redhat.com>
|
|
|
218e99 |
Patchwork-id: 52251
|
|
|
218e99 |
O-Subject: [PATCH v2 1/3] pc: Replace upstream machine types by RHEL-7 types
|
|
|
218e99 |
Bugzilla: 977864
|
|
|
218e99 |
RH-Acked-by: Bandan Das <bsd@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
Bugzilla: 977864
|
|
|
218e99 |
Upstream status: not applicable
|
|
|
218e99 |
|
|
|
218e99 |
Existing machine-types are commented-out instead of being deleted, to
|
|
|
218e99 |
help avoid backport conflicts in the future.
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
218e99 |
[ehabkost: edited patch description]
|
|
|
218e99 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
218e99 |
---
|
|
|
218e99 |
hw/i386/pc_piix.c | 29 +++++++++++++++++++++++++++++
|
|
|
218e99 |
hw/i386/pc_q35.c | 28 ++++++++++++++++++++++++++++
|
|
|
218e99 |
2 files changed, 57 insertions(+)
|
|
|
218e99 |
|
|
|
218e99 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
218e99 |
|
|
|
218e99 |
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
|
|
|
218e99 |
index e26c93d..d8d74a3 100644
|
|
|
218e99 |
--- a/hw/i386/pc_piix.c
|
|
|
218e99 |
+++ b/hw/i386/pc_piix.c
|
|
|
218e99 |
@@ -246,6 +246,8 @@ static void pc_init_pci(QEMUMachineInitArgs *args)
|
|
|
218e99 |
initrd_filename, cpu_model, 1, 1);
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
218e99 |
+
|
|
|
218e99 |
static void pc_init_pci_1_4(QEMUMachineInitArgs *args)
|
|
|
218e99 |
{
|
|
|
218e99 |
has_pvpanic = false;
|
|
|
218e99 |
@@ -778,3 +780,30 @@ static void pc_machine_init(void)
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
machine_init(pc_machine_init);
|
|
|
218e99 |
+
|
|
|
218e99 |
+#endif /* Disabled for Red Hat Enterprise Linux */
|
|
|
218e99 |
+
|
|
|
218e99 |
+/* Red Hat Enterprise Linux machine types */
|
|
|
218e99 |
+
|
|
|
218e99 |
+static void pc_init_rhel700(QEMUMachineInitArgs *args)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ pc_init_pci(args);
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
+static QEMUMachine pc_machine_rhel700 = {
|
|
|
218e99 |
+ .name = "pc-i440fx-rhel7.0.0",
|
|
|
218e99 |
+ .alias = "pc",
|
|
|
218e99 |
+ .desc = "RHEL 7.0.0 PC (i440FX + PIIX, 1996)",
|
|
|
218e99 |
+ .init = pc_init_rhel700,
|
|
|
218e99 |
+ .hot_add_cpu = pc_hot_add_cpu,
|
|
|
218e99 |
+ .max_cpus = 255,
|
|
|
218e99 |
+ .is_default = 1,
|
|
|
218e99 |
+ DEFAULT_MACHINE_OPTIONS,
|
|
|
218e99 |
+};
|
|
|
218e99 |
+
|
|
|
218e99 |
+static void rhel_machine_init(void)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ qemu_register_machine(&pc_machine_rhel700);
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
+machine_init(rhel_machine_init);
|
|
|
218e99 |
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
|
|
|
218e99 |
index 7888dfe..9bcad00 100644
|
|
|
218e99 |
--- a/hw/i386/pc_q35.c
|
|
|
218e99 |
+++ b/hw/i386/pc_q35.c
|
|
|
218e99 |
@@ -208,6 +208,8 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
|
|
|
218e99 |
}
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
+#if 0 /* Disabled for Red Hat Enterprise Linux */
|
|
|
218e99 |
+
|
|
|
218e99 |
static void pc_q35_init_1_4(QEMUMachineInitArgs *args)
|
|
|
218e99 |
{
|
|
|
218e99 |
has_pvpanic = false;
|
|
|
218e99 |
@@ -244,3 +246,29 @@ static void pc_q35_machine_init(void)
|
|
|
218e99 |
}
|
|
|
218e99 |
|
|
|
218e99 |
machine_init(pc_q35_machine_init);
|
|
|
218e99 |
+
|
|
|
218e99 |
+#endif /* Disabled for Red Hat Enterprise Linux */
|
|
|
218e99 |
+
|
|
|
218e99 |
+/* Red Hat Enterprise Linux machine types */
|
|
|
218e99 |
+
|
|
|
218e99 |
+static void pc_q35_init_rhel700(QEMUMachineInitArgs *args)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ pc_q35_init(args);
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
+static QEMUMachine pc_q35_machine_rhel700 = {
|
|
|
218e99 |
+ .name = "pc-q35-rhel7.0.0",
|
|
|
218e99 |
+ .alias = "q35",
|
|
|
218e99 |
+ .desc = "RHEL-7.0.0 PC (Q35 + ICH9, 2009)",
|
|
|
218e99 |
+ .init = pc_q35_init_rhel700,
|
|
|
218e99 |
+ .hot_add_cpu = pc_hot_add_cpu,
|
|
|
218e99 |
+ .max_cpus = 255,
|
|
|
218e99 |
+ DEFAULT_MACHINE_OPTIONS,
|
|
|
218e99 |
+};
|
|
|
218e99 |
+
|
|
|
218e99 |
+static void rhel_pc_q35_machine_init(void)
|
|
|
218e99 |
+{
|
|
|
218e99 |
+ qemu_register_machine(&pc_q35_machine_rhel700);
|
|
|
218e99 |
+}
|
|
|
218e99 |
+
|
|
|
218e99 |
+machine_init(rhel_pc_q35_machine_init);
|