From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmvfY-00089e-B7 for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UmvfW-0005UE-5x for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:40 -0400 Received: from cantor2.suse.de ([195.135.220.15]:32919 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UmvfV-0005U5-St for qemu-devel@nongnu.org; Wed, 12 Jun 2013 20:45:38 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Jun 2013 02:45:15 +0200 Message-Id: <1371084329-814-4-git-send-email-afaerber@suse.de> In-Reply-To: <1371084329-814-1-git-send-email-afaerber@suse.de> References: <1371084329-814-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 03/17] pc: Create pc-*-1.6 machine-types List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , Eduardo Habkost , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Eduardo Habkost Some CPU model fixes are going to be included and they will require compatibility properties in the pc-*-1.5 machine-types. Signed-off-by: Eduardo Habkost Reviewed-by: Igor Mammedov Signed-off-by: Andreas F=C3=A4rber --- hw/i386/pc_piix.c | 14 ++++++++++++-- hw/i386/pc_q35.c | 12 +++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index d618570..7fb2bce 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -327,8 +327,8 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *args= ) } #endif =20 -static QEMUMachine pc_i440fx_machine_v1_5 =3D { - .name =3D "pc-i440fx-1.5", +static QEMUMachine pc_i440fx_machine_v1_6 =3D { + .name =3D "pc-i440fx-1.6", .alias =3D "pc", .desc =3D "Standard PC (i440FX + PIIX, 1996)", .init =3D pc_init_pci, @@ -338,6 +338,15 @@ static QEMUMachine pc_i440fx_machine_v1_5 =3D { DEFAULT_MACHINE_OPTIONS, }; =20 +static QEMUMachine pc_i440fx_machine_v1_5 =3D { + .name =3D "pc-i440fx-1.5", + .desc =3D "Standard PC (i440FX + PIIX, 1996)", + .init =3D pc_init_pci, + .hot_add_cpu =3D pc_hot_add_cpu, + .max_cpus =3D 255, + DEFAULT_MACHINE_OPTIONS, +}; + static QEMUMachine pc_i440fx_machine_v1_4 =3D { .name =3D "pc-i440fx-1.4", .desc =3D "Standard PC (i440FX + PIIX, 1996)", @@ -735,6 +744,7 @@ static QEMUMachine xenfv_machine =3D { =20 static void pc_machine_init(void) { + qemu_register_machine(&pc_i440fx_machine_v1_6); qemu_register_machine(&pc_i440fx_machine_v1_5); qemu_register_machine(&pc_i440fx_machine_v1_4); qemu_register_machine(&pc_machine_v1_3); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 7888dfe..db5c46e 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -215,9 +215,18 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *arg= s) pc_q35_init(args); } =20 +static QEMUMachine pc_q35_machine_v1_6 =3D { + .name =3D "pc-q35-1.6", + .alias =3D "q35", + .desc =3D "Standard PC (Q35 + ICH9, 2009)", + .init =3D pc_q35_init, + .hot_add_cpu =3D pc_hot_add_cpu, + .max_cpus =3D 255, + DEFAULT_MACHINE_OPTIONS, +}; + static QEMUMachine pc_q35_machine_v1_5 =3D { .name =3D "pc-q35-1.5", - .alias =3D "q35", .desc =3D "Standard PC (Q35 + ICH9, 2009)", .init =3D pc_q35_init, .hot_add_cpu =3D pc_hot_add_cpu, @@ -239,6 +248,7 @@ static QEMUMachine pc_q35_machine_v1_4 =3D { =20 static void pc_q35_machine_init(void) { + qemu_register_machine(&pc_q35_machine_v1_6); qemu_register_machine(&pc_q35_machine_v1_5); qemu_register_machine(&pc_q35_machine_v1_4); } --=20 1.8.1.4