From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YpdHt-00068U-Am for qemu-devel@nongnu.org; Tue, 05 May 2015 09:53:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YpdHp-0008AC-7S for qemu-devel@nongnu.org; Tue, 05 May 2015 09:53:29 -0400 Date: Tue, 5 May 2015 15:53:08 +0200 From: Thomas Huth Message-ID: <20150505155308.5d7abd4f@thh440s> In-Reply-To: <1430816036-26408-2-git-send-email-nikunj@linux.vnet.ibm.com> References: <1430816036-26408-1-git-send-email-nikunj@linux.vnet.ibm.com> <1430816036-26408-2-git-send-email-nikunj@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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: qemu-devel@nongnu.org, aik@ozlabs.ru, agraf@suse.de, mdroth@linux.vnet.ibm.com, qemu-ppc@nongnu.org, david@gibson.dropbear.id.au 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? Anyway, the duplication should go away, so: Reviewed-by: Thomas Huth