From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:54770)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1TsZgL-0001Mt-9N
	for qemu-devel@nongnu.org; Tue, 08 Jan 2013 08:57:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1TsZgK-0004o8-47
	for qemu-devel@nongnu.org; Tue, 08 Jan 2013 08:57:33 -0500
Received: from mail-ia0-f175.google.com ([209.85.210.175]:47654)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1TsZgJ-0004o4-W2
	for qemu-devel@nongnu.org; Tue, 08 Jan 2013 08:57:32 -0500
Received: by mail-ia0-f175.google.com with SMTP id 21so215080iay.20
	for <qemu-devel@nongnu.org>; Tue, 08 Jan 2013 05:57:31 -0800 (PST)
From: Anthony Liguori <anthony@codemonkey.ws>
In-Reply-To: <1357631962-10484-1-git-send-email-kraxel@redhat.com>
References: <1357631962-10484-1-git-send-email-kraxel@redhat.com>
Date: Tue, 08 Jan 2013 07:57:27 -0600
Message-ID: <87mwwj22wo.fsf@codemonkey.ws>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Re: [Qemu-devel] [PATCH] pc: rename machine types
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org

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