From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqA6Y-0007CE-JB for qemu-devel@nongnu.org; Wed, 06 May 2015 20:55:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqA6X-0001WU-4F for qemu-devel@nongnu.org; Wed, 06 May 2015 20:55:58 -0400 Date: Thu, 7 May 2015 10:55:52 +1000 From: David Gibson Message-ID: <20150507005552.GD1407@voom.redhat.com> References: <1430816036-26408-1-git-send-email-nikunj@linux.vnet.ibm.com> <1430816036-26408-2-git-send-email-nikunj@linux.vnet.ibm.com> <20150505155308.5d7abd4f@thh440s> <87sibajma6.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="veXX9dWIonWZEC6h" Content-Disposition: inline In-Reply-To: <87sibajma6.fsf@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH v3 1/6] spapr_pci: remove duplicate macros List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Nikunj A Dadhania Cc: agraf@suse.de, Thomas Huth , aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org --veXX9dWIonWZEC6h Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, May 06, 2015 at 11:11:05AM +0530, Nikunj A Dadhania wrote: > Thomas Huth writes: >=20 > > On Tue, 5 May 2015 14:23:51 +0530 > > Nikunj A Dadhania wrote: > > > >> Signed-off-by: Nikunj A Dadhania > >> --- > >> hw/ppc/spapr_pci.c | 11 ----------- > >> 1 file changed, 11 deletions(-) > >>=20 > >> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c > >> index 2e7590c..4df3a33 100644 > >> --- a/hw/ppc/spapr_pci.c > >> +++ b/hw/ppc/spapr_pci.c > >> @@ -1475,17 +1475,6 @@ PCIHostState *spapr_create_phb(sPAPREnvironment= *spapr, int index) > >> return PCI_HOST_BRIDGE(dev); > >> } > >> =20 > >> -/* Macros to operate with address in OF binding to PCI */ > >> -#define b_x(x, p, l) (((x) & ((1<<(l))-1)) << (p)) > >> -#define b_n(x) b_x((x), 31, 1) /* 0 if relocatable */ > >> -#define b_p(x) b_x((x), 30, 1) /* 1 if prefetchable */ > >> -#define b_t(x) b_x((x), 29, 1) /* 1 if the address is aliase= d */ > >> -#define b_ss(x) b_x((x), 24, 2) /* the space code */ > >> -#define b_bbbbbbbb(x) b_x((x), 16, 8) /* bus number */ > >> -#define b_ddddd(x) b_x((x), 11, 5) /* device number */ > >> -#define b_fff(x) b_x((x), 8, 3) /* function number */ > >> -#define b_rrrrrrrr(x) b_x((x), 0, 8) /* register number */ > > > > Seems like the duplication is not in master yet, only in spapr-next, > > and has apparently been introduced by commit 2c938a6692c01818e=20 > > (spapr_pci: enable basic hotplug operations) ... > > So an alternative would be to fix up that patch instead. David? >=20 > Yes, that would be fine with me as well. I've amended the patch in spapr-next. >=20 > > Anyway, the duplication should go away, so: > > > > Reviewed-by: Thomas Huth >=20 > Regards > Nikunj >=20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --veXX9dWIonWZEC6h Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVSrgXAAoJEGw4ysog2bOSreYQANr2StvOZGGBOauFH4f1aylf BPzxocQlxZ2f74kkPDOT0XsJar6VtcdkfTDmVLMhfGvuUnK+HM3rQH3r5AIOoIi6 VzmmhtVhtNp2g4r99bQUILZNkqOUjTccRJH9NjTTdJ1j6pntB29h3UM9enWRxnyc zns2urtEgURfVFz0Xm7Askt4S3OdimH58NQt6KPsidd2E1iRHNnO3JYhozHrYpNK jkmAl/a1JiiWE/cjydcrmJO1+ff8PU6dSthSO4vqnnh3umB/LH1Hza9HshYezJSk QJeLpBRQ+Gu2lbN5jOSjlmE09++BcBTXI6tmKlv+9BEevZi1wDECS7JnHUmTFjf8 +4EY4PgPYiBrUQzkApn3iHqpJB1e+3DOc4OMh7XzUSHVvEfCSHHSXhhlAd42bl+4 rMAr8bM+wUqrwkOLI+hYO9LWMxHofl2WYVkBN/dMaq+w4luVlGRFP5WMzvbWK8DN 2SyrXoO/QpELXkMxCdmnxJp17ZLAuBDlBxU+e5kaQ9hdTFqR7BF+AFjZDu4p4d0y TKxkXQms+VhiyTf12NLoMZ+8DI7HjhuZLIZRyhDD10VQaWxIdm12oaW30crrD7mp mMIOOeZNttUSlR5RueZKUBU2aFz4KJ5T2qv8sMGswwU3S4VMW0uaB7LlN1ZMDKIu fc1Qpj1v6XAlCe+dTnWT =4C6S -----END PGP SIGNATURE----- --veXX9dWIonWZEC6h--