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>
This commit is contained in:
parent
7d9f7b51cc
commit
94dec5948a
|
@ -282,10 +282,10 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static QEMUMachine pc_machine_v1_4 = {
|
static QEMUMachine pc_i440fx_machine_v1_4 = {
|
||||||
.name = "pc-1.4",
|
.name = "pc-i440fx-1.4",
|
||||||
.alias = "pc",
|
.alias = "pc",
|
||||||
.desc = "Standard PC",
|
.desc = "Standard PC (i440FX + PIIX, 1996)",
|
||||||
.init = pc_init_pci_1_3,
|
.init = pc_init_pci_1_3,
|
||||||
.max_cpus = 255,
|
.max_cpus = 255,
|
||||||
.is_default = 1,
|
.is_default = 1,
|
||||||
|
@ -646,7 +646,7 @@ static QEMUMachine xenfv_machine = {
|
||||||
|
|
||||||
static void pc_machine_init(void)
|
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_3);
|
||||||
qemu_register_machine(&pc_machine_v1_2);
|
qemu_register_machine(&pc_machine_v1_2);
|
||||||
qemu_register_machine(&pc_machine_v1_1);
|
qemu_register_machine(&pc_machine_v1_1);
|
||||||
|
|
|
@ -209,9 +209,9 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
|
||||||
}
|
}
|
||||||
|
|
||||||
static QEMUMachine pc_q35_machine = {
|
static QEMUMachine pc_q35_machine = {
|
||||||
.name = "q35-next",
|
.name = "pc-q35-1.4",
|
||||||
.alias = "q35",
|
.alias = "q35",
|
||||||
.desc = "Q35 chipset PC",
|
.desc = "Standard PC (Q35 + ICH9, 2009)",
|
||||||
.init = pc_q35_init,
|
.init = pc_q35_init,
|
||||||
.max_cpus = 255,
|
.max_cpus = 255,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue