diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2012-02-21 23:18:55 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-22 09:02:18 -0600 |
| commit | 382b3a681d002749f22cb87ec6b523432f81e8f2 (patch) | |
| tree | 8ab68303831186528c3401c5b76a8dafbd0ad4fa /hw | |
| parent | ed778c8d9f6d378943dc6d92fbe0bf5c3373694d (diff) | |
hw/pc_piix: add pc-1.1
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | 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 2fc42117d0..fcf0153d37 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); |