From c667d7649a2ad2176552b68d40b518bf2622b933 Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 22 Dec 2009 17:05:57 -0200
Subject: [PATCH 10/16] Introduce rhel 5.5.0 machine type

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <8f80b993cc7916f2088ae4c9ce7724eb1f07f7a9.1261501421.git.quintela@redhat.com>
Patchwork-id: 5897
O-Subject: [PATCH 05/11] Introduce rhel 5.5.0 machine type
Bugzilla: 541731
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Dor Laor <dlaor@redhat.com>
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
RH-Acked-by: Marcelo Tosatti <mtosatti@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 qemu/hw/boards.h           |    1 +
 qemu/hw/pc.c               |   12 ++++++++++++
 qemu/target-i386/machine.c |    3 ++-
 3 files changed, 15 insertions(+), 1 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 qemu/hw/boards.h           |    1 +
 qemu/hw/pc.c               |   12 ++++++++++++
 qemu/target-i386/machine.c |    3 ++-
 3 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/qemu/hw/boards.h b/qemu/hw/boards.h
index d3aae62..60b42af 100644
--- a/qemu/hw/boards.h
+++ b/qemu/hw/boards.h
@@ -40,6 +40,7 @@ extern QEMUMachine axisdev88_machine;
 /* pc.c */
 extern QEMUMachine pc_machine;
 extern QEMUMachine rhel540_machine;
+extern QEMUMachine rhel550_machine;
 extern QEMUMachine isapc_machine;
 
 /* ppc.c */
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index e51a4f0..69f77df 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -1293,6 +1293,18 @@ QEMUMachine rhel540_machine = {
     .max_cpus = 255,
 };
 
+
+QEMUMachine rhel550_machine = {
+    .name = "rhel5.5.0",
+    .desc = "RHEL 5.5.0 PC",
+    .init = pc_init_pci,
+    .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
+    .max_cpus = 255,
+    .devices = (DeviceVersion []) {
+		{ /* Empty */ }
+    },
+};
+
 QEMUMachine isapc_machine = {
     .name = "isapc",
     .desc = "ISA-only PC",
diff --git a/qemu/target-i386/machine.c b/qemu/target-i386/machine.c
index c150814..8a06799 100644
--- a/qemu/target-i386/machine.c
+++ b/qemu/target-i386/machine.c
@@ -8,8 +8,9 @@
 
 void register_machines(void)
 {
-    qemu_register_machine(&pc_machine);
+    qemu_register_machine(&rhel550_machine);
     qemu_register_machine(&rhel540_machine);
+    qemu_register_machine(&pc_machine);
 #ifdef CONFIG_ISAPC
     qemu_register_machine(&isapc_machine);
 #endif
-- 
1.6.3.rc4.29.g8146