From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK5xG-000143-IP for qemu-devel@nongnu.org; Thu, 12 Sep 2013 08:25:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VK5x9-000269-7f for qemu-devel@nongnu.org; Thu, 12 Sep 2013 08:25:02 -0400 Received: from cantor2.suse.de ([195.135.220.15]:34242 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VK5x8-00025x-UC for qemu-devel@nongnu.org; Thu, 12 Sep 2013 08:24:55 -0400 Message-ID: <5231B291.7070208@suse.de> Date: Thu, 12 Sep 2013 14:24:49 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <20130912062443.GA16892@redhat.com> In-Reply-To: <20130912062443.GA16892@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] pc: add 1.7 machine types for piix,q35 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Paolo Bonzini , Stefan Hajnoczi , qemu-devel@nongnu.org, Anthony Liguori , Eduardo Habkost Am 12.09.2013 08:24, schrieb Michael S. Tsirkin: > piix 1.7 is the default. >=20 > Signed-off-by: Michael S. Tsirkin > --- > hw/i386/pc_piix.c | 19 +++++++++++++++++-- > hw/i386/pc_q35.c | 17 ++++++++++++++++- > 2 files changed, 33 insertions(+), 3 deletions(-) Looks like you forget to rebase? Stefan's net-next tree was merged last night, so there's already the two _v1_7 machines registered at least. The pc_init_ function and the 1_6 -> 1_7 #define might still be applicable though. Andreas >=20 > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 66551b4..0ade373 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -274,6 +274,11 @@ static void pc_compat_1_2(QEMUMachineInitArgs *arg= s) > disable_kvm_pv_eoi(); > } > =20 > +static void pc_init_pci_1_7(QEMUMachineInitArgs *args) > +{ > + pc_init_pci(args); > +} > + > static void pc_init_pci_1_6(QEMUMachineInitArgs *args) > { > pc_compat_1_6(args); > @@ -344,14 +349,23 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *= args) > .desc =3D "Standard PC (i440FX + PIIX, 1996)", \ > .hot_add_cpu =3D pc_hot_add_cpu > =20 > -#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS > +#define PC_I440FX_1_7_MACHINE_OPTIONS PC_I440FX_MACHINE_OPTIONS > + > +static QEMUMachine pc_i440fx_machine_v1_7 =3D { > + PC_I440FX_1_7_MACHINE_OPTIONS, > + .name =3D "pc-i440fx-1.7", > + .alias =3D "pc", > + .init =3D pc_init_pci_1_7, > + .is_default =3D 1, > +}; > + > +#define PC_I440FX_1_6_MACHINE_OPTIONS PC_I440FX_1_7_MACHINE_OPTIONS > =20 > static QEMUMachine pc_i440fx_machine_v1_6 =3D { > PC_I440FX_1_6_MACHINE_OPTIONS, > .name =3D "pc-i440fx-1.6", > .alias =3D "pc", > .init =3D pc_init_pci_1_6, > - .is_default =3D 1, > }; > =20 > static QEMUMachine pc_i440fx_machine_v1_5 =3D { > @@ -740,6 +754,7 @@ static QEMUMachine xenfv_machine =3D { > =20 > static void pc_machine_init(void) > { > + qemu_register_machine(&pc_i440fx_machine_v1_7); > qemu_register_machine(&pc_i440fx_machine_v1_6); > qemu_register_machine(&pc_i440fx_machine_v1_5); > qemu_register_machine(&pc_i440fx_machine_v1_4); > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 54c2b4c..0abd9b1 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -238,6 +238,11 @@ static void pc_compat_1_4(QEMUMachineInitArgs *arg= s) > x86_cpu_compat_set_features("Westmere", FEAT_1_ECX, 0, CPUID_EXT_P= CLMULQDQ); > } > =20 > +static void pc_q35_init_1_7(QEMUMachineInitArgs *args) > +{ > + pc_q35_init(args); > +} > + > static void pc_q35_init_1_6(QEMUMachineInitArgs *args) > { > pc_compat_1_6(args); > @@ -261,7 +266,16 @@ static void pc_q35_init_1_4(QEMUMachineInitArgs *a= rgs) > .desc =3D "Standard PC (Q35 + ICH9, 2009)", \ > .hot_add_cpu =3D pc_hot_add_cpu > =20 > -#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS > +#define PC_Q35_1_7_MACHINE_OPTIONS PC_Q35_MACHINE_OPTIONS > + > +static QEMUMachine pc_q35_machine_v1_7 =3D { > + PC_Q35_1_7_MACHINE_OPTIONS, > + .name =3D "pc-q35-1.7", > + .alias =3D "q35", > + .init =3D pc_q35_init_1_7, > +}; > + > +#define PC_Q35_1_6_MACHINE_OPTIONS PC_Q35_1_7_MACHINE_OPTIONS > =20 > static QEMUMachine pc_q35_machine_v1_6 =3D { > PC_Q35_1_6_MACHINE_OPTIONS, > @@ -296,6 +310,7 @@ static QEMUMachine pc_q35_machine_v1_4 =3D { > =20 > static void pc_q35_machine_init(void) > { > + qemu_register_machine(&pc_q35_machine_v1_7); > 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 --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg