From 3a09a4563acf66222a4093a96f0c64be878a845e Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Thu, 31 Dec 2009 02:38:58 -0200
Subject: [PATCH 3/4] make pc an alias of rhel5.4.0

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <0c36901cc20cde8ba56ce3bcac5b992804eeaf72.1262225896.git.quintela@redhat.com>
Patchwork-id: 6027
O-Subject: [PATCH 2/3] make pc an alias of rhel5.4.0
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               |    9 +--------
 qemu/target-i386/machine.c |    1 -
 3 files changed, 1 insertions(+), 10 deletions(-)

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

diff --git a/qemu/hw/boards.h b/qemu/hw/boards.h
index ee6e6f5..75f5d72 100644
--- a/qemu/hw/boards.h
+++ b/qemu/hw/boards.h
@@ -39,7 +39,6 @@ extern QEMUMachine bareetraxfs_machine;
 extern QEMUMachine axisdev88_machine;
 
 /* pc.c */
-extern QEMUMachine pc_machine;
 extern QEMUMachine rhel540_machine;
 extern QEMUMachine rhel550_machine;
 extern QEMUMachine isapc_machine;
diff --git a/qemu/hw/pc.c b/qemu/hw/pc.c
index bfa904c..ee9725d 100644
--- a/qemu/hw/pc.c
+++ b/qemu/hw/pc.c
@@ -1277,16 +1277,9 @@ int machine_device_version(const char *name, int version_id)
     return version_id;
 }
 
-QEMUMachine pc_machine = {
-    .name = "pc",
-    .desc = "Standard PC",
-    .init = pc_init_pci,
-    .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
-    .max_cpus = 255,
-};
-
 QEMUMachine rhel540_machine = {
     .name = "rhel5.4.0",
+    .alias = "pc",
     .desc = "RHEL 5.4.0 PC",
     .init = pc_init_pci,
     .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
diff --git a/qemu/target-i386/machine.c b/qemu/target-i386/machine.c
index db344c3..8b39b79 100644
--- a/qemu/target-i386/machine.c
+++ b/qemu/target-i386/machine.c
@@ -10,7 +10,6 @@ void register_machines(void)
 {
     qemu_register_machine(&rhel540_machine);
     qemu_register_machine(&rhel550_machine);
-    qemu_register_machine(&pc_machine);
 #ifdef CONFIG_ISAPC
     qemu_register_machine(&isapc_machine);
 #endif
-- 
1.6.3.rc4.29.g8146