[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v11 8/9] hw/pc_piix: add pc-1.1
From: |
Jordan Justen |
Subject: |
[Qemu-devel] [PATCH v11 8/9] hw/pc_piix: add pc-1.1 |
Date: |
Tue, 21 Feb 2012 23:18:55 -0800 |
Signed-off-by: Jordan Justen <address@hidden>
---
hw/pc_piix.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 2fc4211..fcf0153 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -371,8 +371,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size,
}
#endif
-static QEMUMachine pc_machine_v1_0 = {
- .name = "pc-1.0",
+static QEMUMachine pc_machine_v1_1 = {
+ .name = "pc-1.1",
.alias = "pc",
.desc = "Standard PC",
.init = pc_init_pci,
@@ -380,6 +380,13 @@ static QEMUMachine pc_machine_v1_0 = {
.is_default = 1,
};
+static QEMUMachine pc_machine_v1_0 = {
+ .name = "pc-1.0",
+ .desc = "Standard PC",
+ .init = pc_init_pci,
+ .max_cpus = 255,
+};
+
static QEMUMachine pc_machine_v0_15 = {
.name = "pc-0.15",
.desc = "Standard PC",
@@ -669,6 +676,7 @@ static QEMUMachine xenfv_machine = {
static void pc_machine_init(void)
{
+ qemu_register_machine(&pc_machine_v1_1);
qemu_register_machine(&pc_machine_v1_0);
qemu_register_machine(&pc_machine_v0_15);
qemu_register_machine(&pc_machine_v0_14);
--
1.7.1
- [Qemu-devel] [PATCH v11 0/9] PC system flash support, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 1/9] blockdev: allow read-only pflash devices, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 2/9] pflash_cfi01/02: support read-only pflash devices, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 7/9] hw/pc_piix: remove is_default for pc-0.15, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 6/9] hw/pc_sysfw: support system flash memory with pflash, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 8/9] hw/pc_piix: add pc-1.1,
Jordan Justen <=
- [Qemu-devel] [PATCH v11 3/9] vl: make find_default_machine externally visible, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 9/9] pc_piix/pc_sysfw: enable flash by default, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 4/9] hw/pc: move rom init to pc_sysfw.c, Jordan Justen, 2012/02/22
- [Qemu-devel] [PATCH v11 5/9] hw/pc_sysfw: enable pc-sysfw as a qdev, Jordan Justen, 2012/02/22
- Re: [Qemu-devel] [PATCH v11 0/9] PC system flash support, Anthony Liguori, 2012/02/22