From da326b011d03d961c8f5648bd782d14611fb1f1d Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Thu, 31 Dec 2009 02:38:59 -0200
Subject: [PATCH 4/4] Introduce rhel5.4.4 machine type

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <e4d9c920cee7f7c9e51a191256f2c7b01957259f.1262225896.git.quintela@redhat.com>
Patchwork-id: 6028
O-Subject: [PATCH 3/3] Introduce rhel5.4.4 machine type
Bugzilla: 553187
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               |   13 +++++++++++++
 qemu/target-i386/machine.c |    1 +
 3 files changed, 15 insertions(+), 0 deletions(-)

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

diff --git a/qemu/hw/boards.h b/qemu/hw/boards.h
index 75f5d72..0fe63b1 100644
--- a/qemu/hw/boards.h
+++ b/qemu/hw/boards.h
@@ -40,6 +40,7 @@ extern QEMUMachine axisdev88_machine;
 
 /* pc.c */
 extern QEMUMachine rhel540_machine;
+extern QEMUMachine rhel544_machine;
 extern QEMUMachine rhel550_machine;
 extern QEMUMachine isapc_machine;
 
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index ee9725d..53d8dd2 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -1293,6 +1293,19 @@ QEMUMachine rhel540_machine = {
     },
 };
 
+QEMUMachine rhel544_machine = {
+    .name = "rhel5.4.4",
+    .desc = "RHEL 5.4.4 PC",
+    .init = pc_init_pci,
+    .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
+    .max_cpus = 255,
+    .devices = (DeviceVersion []) {
+		{ .name = "ide", .version_id =  3},
+		{ .name = "virtio-blk", .version_id =  2},
+		{ .name = "qxl", .version_id =  3},
+		{ /* Empty */ }
+    },
+};
 
 QEMUMachine rhel550_machine = {
     .name = "rhel5.5.0",
diff --git a/qemu/target-i386/machine.c b/qemu/target-i386/machine.c
index 8b39b79..a72f05f 100644
--- a/qemu/target-i386/machine.c
+++ b/qemu/target-i386/machine.c
@@ -9,6 +9,7 @@
 void register_machines(void)
 {
     qemu_register_machine(&rhel540_machine);
+    qemu_register_machine(&rhel544_machine);
     qemu_register_machine(&rhel550_machine);
 #ifdef CONFIG_ISAPC
     qemu_register_machine(&isapc_machine);
-- 
1.6.3.rc4.29.g8146