From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsU5n-0002zm-0i for qemu-devel@nongnu.org; Tue, 08 Jan 2013 02:59:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsU5l-0002C7-QN for qemu-devel@nongnu.org; Tue, 08 Jan 2013 02:59:26 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsU5l-0002Bz-J5 for qemu-devel@nongnu.org; Tue, 08 Jan 2013 02:59:25 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r087xO7L023625 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 8 Jan 2013 02:59:24 -0500 From: Gerd Hoffmann Date: Tue, 8 Jan 2013 08:59:22 +0100 Message-Id: <1357631962-10484-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] pc: rename machine types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 * q35-next becomes q35-1.4 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 --- 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