From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:46084)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Ui6pG-0006HA-8D
	for qemu-devel@nongnu.org; Thu, 30 May 2013 13:39:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Ui6pA-0003ZJ-6f
	for qemu-devel@nongnu.org; Thu, 30 May 2013 13:39:46 -0400
Received: from mx1.redhat.com ([209.132.183.28]:60362)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1Ui6p9-0003ZA-TC
	for qemu-devel@nongnu.org; Thu, 30 May 2013 13:39:40 -0400
Date: Thu, 30 May 2013 20:40:05 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20130530174005.GD29091@redhat.com>
References: <1369911913-10934-1-git-send-email-mst@redhat.com>
	<1369911913-10934-5-git-send-email-mst@redhat.com>
	<51A77677.4080207@suse.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <51A77677.4080207@suse.de>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH v2 4/5] pc: add 1.6 compat type
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: Andreas =?iso-8859-1?Q?F=E4rber?= <afaerber@suse.de>
Cc: Anthony Liguori <aliguori@us.ibm.com>, qemu-devel@nongnu.org, Eduardo Habkost <ehabkost@redhat.com>

On Thu, May 30, 2013 at 05:55:35PM +0200, Andreas F=E4rber wrote:
> 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 <mst@redhat.com>
>=20
> You did notice that Eduardo had a similar patch yesterday or so?
> Yours does not handle q35 by comparison.

Hmm I'll have to figure out the dependency.

> > ---
> >  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 { 0x3=
f6, 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;
>=20
> I don't see this used here, and it's replaced in next patch.
>=20
> Andreas
>=20
> > =20
> >  /* PC hardware initialisation */
> >  static void pc_init1(MemoryRegion *system_memory,
> > @@ -340,9 +341,19 @@ static void pc_xen_hvm_init(QEMUMachineInitArgs =
*args)
> >  }
> >  #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
>=20
> --=20
> SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
> GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrn=
berg