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

[Anthony Liguori <anthony@codemonkey.ws>]

Gerd Hoffmann <kraxel@redhat.com> 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 piix-1.4

PIIX is the southbridge.  A more appropriate (and google-able) name
would be i440fx-1.4.

>   * q35-next becomes q35-1.4

I can't help but bikeshed a little here.  I dislike that we are going
from something that's reasonable understandable (pc) to something
completely obscure (piix and q35).

I would be in favor of the i440fx machine being called "legacy-pc" and
q35 gaining the title of "pc".

Regards,

Anthony Liguori

>
> The pc-1.3 (+older) names are maintained for compatibility reason.
> For the same reason the "pc" alias is kept.
>
> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/pc_piix.c |    6 +++---
>  hw/pc_q35.c  |    2 +-
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/hw/pc_piix.c b/hw/pc_piix.c
> index 2b3d58b..880c6fa 100644
> --- a/hw/pc_piix.c
> +++ b/hw/pc_piix.c
> @@ -282,8 +282,8 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args)
>  }
>  #endif
>  
> -static QEMUMachine pc_machine_v1_4 = {
> -    .name = "pc-1.4",
> +static QEMUMachine pc_piix_machine_v1_4 = {
> +    .name = "piix-1.4",
>      .alias = "pc",
>      .desc = "Standard PC",
>      .init = pc_init_pci_1_3,
> @@ -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_piix_machine_v1_4);
>      qemu_register_machine(&pc_machine_v1_3);
>      qemu_register_machine(&pc_machine_v1_2);
>      qemu_register_machine(&pc_machine_v1_1);
> diff --git a/hw/pc_q35.c b/hw/pc_q35.c
> index ef540b6..660cc3c 100644
> --- a/hw/pc_q35.c
> +++ b/hw/pc_q35.c
> @@ -209,7 +209,7 @@ static void pc_q35_init(QEMUMachineInitArgs *args)
>  }
>  
>  static QEMUMachine pc_q35_machine = {
> -    .name = "q35-next",
> +    .name = "q35-1.4",
>      .alias = "q35",
>      .desc = "Q35 chipset PC",
>      .init = pc_q35_init,
> -- 
> 1.7.1