From f4d16dba6aa10fbe8b484842561bfa37428bc2dd Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 22 Dec 2009 17:05:56 -0200
Subject: [PATCH 09/16] Introduce rhel5.4.0 machine type

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <118571c8e115656052e321e45894398119009787.1261501421.git.quintela@redhat.com>
Patchwork-id: 5894
O-Subject: [PATCH 04/11] Introduce rhel5.4.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               |    8 ++++++++
 qemu/target-i386/machine.c |    1 +
 3 files changed, 10 insertions(+), 0 deletions(-)

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

diff --git a/qemu/hw/boards.h b/qemu/hw/boards.h
index 9e146ce..d3aae62 100644
--- a/qemu/hw/boards.h
+++ b/qemu/hw/boards.h
@@ -39,6 +39,7 @@ extern QEMUMachine axisdev88_machine;
 
 /* pc.c */
 extern QEMUMachine pc_machine;
+extern QEMUMachine rhel540_machine;
 extern QEMUMachine isapc_machine;
 
 /* ppc.c */
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index af29c9a..e51a4f0 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -1285,6 +1285,14 @@ QEMUMachine pc_machine = {
     .max_cpus = 255,
 };
 
+QEMUMachine rhel540_machine = {
+    .name = "rhel5.4.0",
+    .desc = "RHEL 5.4.0 PC",
+    .init = pc_init_pci,
+    .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
+    .max_cpus = 255,
+};
+
 QEMUMachine isapc_machine = {
     .name = "isapc",
     .desc = "ISA-only PC",
diff --git a/qemu/target-i386/machine.c b/qemu/target-i386/machine.c
index 313f697..c150814 100644
--- a/qemu/target-i386/machine.c
+++ b/qemu/target-i386/machine.c
@@ -9,6 +9,7 @@
 void register_machines(void)
 {
     qemu_register_machine(&pc_machine);
+    qemu_register_machine(&rhel540_machine);
 #ifdef CONFIG_ISAPC
     qemu_register_machine(&isapc_machine);
 #endif
-- 
1.6.3.rc4.29.g8146