aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2011-11-07 16:33:08 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2011-11-07 10:57:36 -0600
commit19857e625a8dc299b3fdfb8acdcbe1569745e290 (patch)
tree67dd899fbc600fb7806af857589470231a95e4a3
parent6023d832480e6713e5ae81d3b74f53e6306f3a1b (diff)
pc: add 1.0 machine type
This patch adds a pc-1.0 machine type. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/pc_piix.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 8c7f2b7337..93e40d037f 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -297,8 +297,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
}
#endif
-static QEMUMachine pc_machine = {
- .name = "pc-0.14",
+static QEMUMachine pc_machine_v1_0 = {
+ .name = "pc-1.0",
.alias = "pc",
.desc = "Standard PC",
.init = pc_init_pci,
@@ -306,6 +306,13 @@ static QEMUMachine pc_machine = {
.is_default = 1,
};
+static QEMUMachine pc_machine_v0_14 = {
+ .name = "pc-0.14",
+ .desc = "Standard PC",
+ .init = pc_init_pci,
+ .max_cpus = 255,
+};
+
static QEMUMachine pc_machine_v0_13 = {
.name = "pc-0.13",
.desc = "Standard PC",
@@ -521,7 +528,8 @@ static QEMUMachine xenfv_machine = {
static void pc_machine_init(void)
{
- qemu_register_machine(&pc_machine);
+ qemu_register_machine(&pc_machine_v1_0);
+ qemu_register_machine(&pc_machine_v0_14);
qemu_register_machine(&pc_machine_v0_13);
qemu_register_machine(&pc_machine_v0_12);
qemu_register_machine(&pc_machine_v0_11);