diff options
| author | Gerd Hoffmann | 2012-09-13 10:50:31 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2012-09-26 09:24:41 +0200 |
| commit | 356d83725675c0140db27b24afed3a2c0c7d9702 (patch) | |
| tree | 3fb5a122fe31097b877d6210d2488823e5a228bb /hw | |
| parent | Merge remote-tracking branch 'origin/master' into staging (diff) | |
| download | qemu-356d83725675c0140db27b24afed3a2c0c7d9702.tar.gz qemu-356d83725675c0140db27b24afed3a2c0c7d9702.tar.xz qemu-356d83725675c0140db27b24afed3a2c0c7d9702.zip | |
add pc-1.3 machine type
Signed-off-by: Gerd Hoffmann <kraxel@redhat.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 88ff0411ca..5a0796bed0 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_2 = { - .name = "pc-1.2", +static QEMUMachine pc_machine_v1_3 = { + .name = "pc-1.3", .alias = "pc", .desc = "Standard PC", .init = pc_init_pci, @@ -358,6 +358,13 @@ static QEMUMachine pc_machine_v1_2 = { .is_default = 1, }; +static QEMUMachine pc_machine_v1_2 = { + .name = "pc-1.2", + .desc = "Standard PC", + .init = pc_init_pci, + .max_cpus = 255, +}; + #define PC_COMPAT_1_1 \ {\ .driver = "virtio-scsi-pci",\ @@ -655,6 +662,7 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { + qemu_register_machine(&pc_machine_v1_3); qemu_register_machine(&pc_machine_v1_2); qemu_register_machine(&pc_machine_v1_1); qemu_register_machine(&pc_machine_v1_0); |