From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui5GO-0006XE-81 for qemu-devel@nongnu.org; Thu, 30 May 2013 11:59:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ui5CU-0001eJ-Ek for qemu-devel@nongnu.org; Thu, 30 May 2013 11:55:43 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45580 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ui5CU-0001du-8l for qemu-devel@nongnu.org; Thu, 30 May 2013 11:55:38 -0400 Message-ID: <51A77677.4080207@suse.de> Date: Thu, 30 May 2013 17:55:35 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1369911913-10934-1-git-send-email-mst@redhat.com> <1369911913-10934-5-git-send-email-mst@redhat.com> In-Reply-To: <1369911913-10934-5-git-send-email-mst@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 4/5] pc: add 1.6 compat type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Michael S. Tsirkin" Cc: Anthony Liguori , qemu-devel@nongnu.org, Eduardo Habkost Am 30.05.2013 13:07, schrieb Michael S. Tsirkin: > Identical to 1.5 ATM, but changes will accumulate. >=20 > Signed-off-by: Michael S. Tsirkin You did notice that Eduardo had a similar patch yesterday or so? Yours does not handle q35 by comparison. > --- > hw/i386/pc_piix.c | 13 ++++++++++++- > 1 file changed, 12 insertions(+), 1 deletion(-) >=20 > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index eaff0b6..2717d83 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -57,6 +57,7 @@ static const int ide_iobase2[MAX_IDE_BUS] =3D { 0x3f6= , 0x376 }; > static const int ide_irq[MAX_IDE_BUS] =3D { 14, 15 }; > =20 > static bool has_pvpanic =3D true; > +static bool has_pci_info =3D true; I don't see this used here, and it's replaced in next patch. Andreas > =20 > /* PC hardware initialisation */ > static void pc_init1(MemoryRegion *system_memory, > @@ -340,9 +341,19 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs *a= rgs) > } > #endif > =20 > +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, > + .hot_add_cpu =3D pc_hot_add_cpu, > + .max_cpus =3D 255, > + .is_default =3D 1, > + DEFAULT_MACHINE_OPTIONS, > +}; > + > static QEMUMachine pc_i440fx_machine_v1_5 =3D { > .name =3D "pc-i440fx-1.5", > - .alias =3D "pc", > .desc =3D "Standard PC (i440FX + PIIX, 1996)", > .init =3D pc_init_pci, > .hot_add_cpu =3D pc_hot_add_cpu, >=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