diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2013-01-08 08:53:13 +0100 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2013-01-11 08:30:24 +0100 |
| commit | 94dec5948aeb240c7e324ce9ecffeb3e066c1b69 (patch) | |
| tree | 15a27badd00830163c29c0ecb424b6ce90471bee /hw/pc_piix.c | |
| parent | 7d9f7b51cc62ec23ac72e3338165a2f3007631a2 (diff) | |
| download | qemu-94dec5948aeb240c7e324ce9ecffeb3e066c1b69.zip qemu-94dec5948aeb240c7e324ce9ecffeb3e066c1b69.tar.gz qemu-94dec5948aeb240c7e324ce9ecffeb3e066c1b69.tar.bz2 | |
pc: rename machine types
Starting with release 1.4 we have a fully functional q35 machine type,
i.e. "qemu -M q35" JustWorks[tm]. Update machine type names to reflect
that:
* pc-1.4 becomes pc-i440fx-1.4
* q35-next becomes pc-q35-1.4
The pc-1.3 (+older) names are maintained for compatibility reasons.
For the same reason the "pc" and "q35" aliases are kept. pc-piix-1.4
continues to be the default machine type, again for compatibility
reasons.
Also updated the description (shown by "qemu -M ?") with host bridge
name, south bridge name and chipset release year.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/pc_piix.c')
| -rw-r--r-- | hw/pc_piix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 2b3d58b..e630aea 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -282,10 +282,10 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args) } #endif -static QEMUMachine pc_machine_v1_4 = { - .name = "pc-1.4", +static QEMUMachine pc_i440fx_machine_v1_4 = { + .name = "pc-i440fx-1.4", .alias = "pc", - .desc = "Standard PC", + .desc = "Standard PC (i440FX + PIIX, 1996)", .init = pc_init_pci_1_3, .max_cpus = 255, .is_default = 1, @@ -646,7 +646,7 @@ static QEMUMachine xenfv_machine = { static void pc_machine_init(void) { - qemu_register_machine(&pc_machine_v1_4); + qemu_register_machine(&pc_i440fx_machine_v1_4); qemu_register_machine(&pc_machine_v1_3); qemu_register_machine(&pc_machine_v1_2); qemu_register_machine(&pc_machine_v1_1); |