From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STZy1-0004Mq-W3 for qemu-devel@nongnu.org; Sun, 13 May 2012 10:40:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STZxz-0001rI-Vc for qemu-devel@nongnu.org; Sun, 13 May 2012 10:40:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59968) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STZxz-0001qt-NR for qemu-devel@nongnu.org; Sun, 13 May 2012 10:40:11 -0400 Date: Sun, 13 May 2012 17:40:09 +0300 From: "Michael S. Tsirkin" Message-ID: <20120513144009.GC25440@redhat.com> References: <1336832466-29363-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1336832466-29363-1-git-send-email-afaerber@suse.de> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-1.1 v2] pc: Add back PCI.rombar compat property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andreas =?iso-8859-1?Q?F=E4rber?= Cc: Paolo Bonzini , Anthony Liguori , qemu-devel@nongnu.org On Sat, May 12, 2012 at 04:21:06PM +0200, Andreas F=E4rber wrote: > From: Paolo Bonzini >=20 > This was erroneously dropped in d6c730086cbf24382eb8cff25551798769edfd8= 4 > (pc: reduce duplication in compat machine types). >=20 > Cc: Michael S. Tsirkin > Signed-off-by: Paolo Bonzini > Signed-off-by: Andreas F=E4rber Acked-by: Michael S. Tsirkin Anthony ca you apply this to 1.1 please? > --- > This is a backport from Paolo's QBus series, as requested by mst. >=20 > hw/pc_piix.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) >=20 > diff --git a/hw/pc_piix.c b/hw/pc_piix.c > index 6a75718..a7aad4b 100644 > --- a/hw/pc_piix.c > +++ b/hw/pc_piix.c > @@ -522,6 +522,10 @@ static QEMUMachine pc_machine_v0_12 =3D { > .driver =3D "virtio-blk-pci",\ > .property =3D "vectors",\ > .value =3D stringify(0),\ > + },{\ > + .driver =3D "PCI",\ > + .property =3D "rombar",\ > + .value =3D stringify(0),\ > } > =20 > static QEMUMachine pc_machine_v0_11 =3D { > --=20 > 1.7.7