From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47602) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STZFN-0004Qm-UU for qemu-devel@nongnu.org; Sun, 13 May 2012 09:54:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1STZFL-0008Th-Uh for qemu-devel@nongnu.org; Sun, 13 May 2012 09:54:05 -0400 Received: from cantor2.suse.de ([195.135.220.15]:54373 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1STZFL-0008TZ-LU for qemu-devel@nongnu.org; Sun, 13 May 2012 09:54:03 -0400 Message-ID: <4FAFBCF3.4030300@suse.de> Date: Sun, 13 May 2012 15:53:55 +0200 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1336832466-29363-1-git-send-email-afaerber@suse.de> <20120513105954.GA23833@redhat.com> In-Reply-To: <20120513105954.GA23833@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 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: "Michael S. Tsirkin" Cc: Paolo Bonzini , Anthony Liguori , qemu-devel@nongnu.org Am 13.05.2012 12:59, schrieb Michael S. Tsirkin: > On Sat, May 12, 2012 at 04:21:06PM +0200, Andreas F=E4rber wrote: >> From: Paolo Bonzini >> >> This was erroneously dropped in d6c730086cbf24382eb8cff25551798769edfd= 84 >> (pc: reduce duplication in compat machine types). >> >> Cc: Michael S. Tsirkin >> Signed-off-by: Paolo Bonzini >> Signed-off-by: Andreas F=E4rber >> --- >> This is a backport from Paolo's QBus series, as requested by mst. >> >> hw/pc_piix.c | 4 ++++ >> 1 files changed, 4 insertions(+), 0 deletions(-) >> >> 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 > So I looked at d6c730086cbf24382eb8cff25551798769edfd84 > which has: >=20 > @@ -583,43 +526,6 @@ static QEMUMachine pc_machine_v0_11 =3D { > .driver =3D "scsi-disk", > .property =3D "ver", > .value =3D "0.11", > - },{ > - .driver =3D "PCI", > - .property =3D "rombar", > - .value =3D stringify(0), >=20 > while this patch readds this property to 0_12. > Intentional? According to my reading of http://repo.or.cz/w/qemu.git/commitdiff/d6c730086cbf24382eb8cff2555179876= 9edfd84?hp=3Dd50c6c8b0fc28c2dd91f3f7ab2a0bbb56419214b both v0_11 and v0_10 had it before your change. Paolo's patch adds it to your PC_COMPAT_0_11 macro, which adds it back to those two machines. Note that the diff ignores the containing macro and names the preceding struct. If you apply it locally you can verify. Andreas --=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