Re: [Qemu-devel] [PATCH] pc: rename machine types

[Markus Armbruster]

Gerd Hoffmann <address@hidden> writes:

> 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-piix-1.4

Actually, it becomes pc-i440fx-1.4 (see first hunk below).

>   * 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.

Not sure we really need q35, but it's fine with me.

> Also updated the description (shown by "qemu -M ?") with host bridge
> name, south bridge name and chipset release year.

Appreciated!

> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  hw/pc_piix.c |    8 ++++----
>  hw/pc_q35.c  |    4 ++--
>  2 files changed, 6 insertions(+), 6 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,
[...]