diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2012-06-11 10:38:22 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2012-06-22 10:49:55 +0200 |
| commit | f1dacf1cedbf0f46c13139f3961ef8a976dc71e3 (patch) | |
| tree | 3e566c4e39f926a0618124c9bedb89eafbbe1e4e /hw/pc_piix.c | |
| parent | 13d1fd44c46629aad672f192abbf02238c6cbf36 (diff) | |
| download | qemu-f1dacf1cedbf0f46c13139f3961ef8a976dc71e3.zip qemu-f1dacf1cedbf0f46c13139f3961ef8a976dc71e3.tar.gz qemu-f1dacf1cedbf0f46c13139f3961ef8a976dc71e3.tar.bz2 | |
add pc-1.2
Diffstat (limited to 'hw/pc_piix.c')
| -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 eae258c..2ed9f1a 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -349,8 +349,8 @@ static void pc_xen_hvm_init(ram_addr_t ram_size, } #endif -static QEMUMachine pc_machine_v1_1 = { - .name = "pc-1.1", +static QEMUMachine pc_machine_v1_2 = { + .name = "pc-1.2", .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, @@ -358,6 +358,13 @@ static QEMUMachine pc_machine_v1_1 = { .is_default = 1, }; +static QEMUMachine pc_machine_v1_1 = { + .name = "pc-1.1", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, +}; + #define PC_COMPAT_1_0 \ {\ .driver = "pc-sysfw",\ @@ -612,6 +619,7 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { + qemu_register_machine(&pc_machine_v1_2); qemu_register_machine(&pc_machine_v1_1); qemu_register_machine(&pc_machine_v1_0); qemu_register_machine(&pc_machine_v0_15); |