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_q35.c | |
| parent | 7d9f7b51cc62ec23ac72e3338165a2f3007631a2 (diff) | |
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_q35.c')
| -rw-r--r-- | hw/pc_q35.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/pc_q35.c b/hw/pc_q35.c index ef540b6a71..52d997613f 100644 --- a/hw/pc_q35.c +++ b/hw/pc_q35.c @@ -209,9 +209,9 @@ static void pc_q35_init(QEMUMachineInitArgs *args) } static QEMUMachine pc_q35_machine = { - .name = "q35-next", + .name = "pc-q35-1.4", .alias = "q35", - .desc = "Q35 chipset PC", + .desc = "Standard PC (Q35 + ICH9, 2009)", .init = pc_q35_init, .max_cpus = 255, }; |