From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqDrs-0005lU-HU for qemu-devel@nongnu.org; Thu, 07 May 2015 00:57:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YqDrn-00031l-Fo for qemu-devel@nongnu.org; Thu, 07 May 2015 00:57:04 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:39864) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YqDrm-00030w-Ru for qemu-devel@nongnu.org; Thu, 07 May 2015 00:56:59 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 7 May 2015 14:56:54 +1000 From: Nikunj A Dadhania In-Reply-To: <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> <20150507005552.GD1407@voom.redhat.com> Date: Thu, 07 May 2015 10:25:57 +0530 Message-ID: <87wq0lhtpe.fsf@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain 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: David Gibson Cc: agraf@suse.de, Thomas Huth , aik@ozlabs.ru, mdroth@linux.vnet.ibm.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org David Gibson writes: > On Wed, May 06, 2015 at 11:11:05AM +0530, Nikunj A Dadhania wrote: >> Thomas Huth writes: >> >> > 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(-) >> >> >> >> 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); >> >> } >> >> >> >> -/* 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 aliased */ >> >> -#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 >> > (spapr_pci: enable basic hotplug operations) ... >> > So an alternative would be to fix up that patch instead. David? >> >> Yes, that would be fine with me as well. > > I've amended the patch in spapr-next. Great, I will rebase and drop this patch. > >> >> > Anyway, the duplication should go away, so: >> > >> > Reviewed-by: Thomas Huth >> >> Regards >> Nikunj >> > > -- > 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