From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fhw8r-000075-Pp for qemu-devel@nongnu.org; Tue, 24 Jul 2018 08:10:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fhw8l-0001Ry-Nk for qemu-devel@nongnu.org; Tue, 24 Jul 2018 08:10:13 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:53189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fhw8l-0001Rh-Fb for qemu-devel@nongnu.org; Tue, 24 Jul 2018 08:10:07 -0400 Received: by mail-wm0-x229.google.com with SMTP id o11-v6so2275626wmh.2 for ; Tue, 24 Jul 2018 05:10:07 -0700 (PDT) References: <20180716074038.3364-1-yuval.shaia@oracle.com> <20180716074038.3364-4-yuval.shaia@oracle.com> From: Marcel Apfelbaum Message-ID: Date: Tue, 24 Jul 2018 15:10:04 +0300 MIME-Version: 1.0 In-Reply-To: <20180716074038.3364-4-yuval.shaia@oracle.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [Qemu-devel] [PATCH 03/13] hw/rdma: Modify debug macros List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yuval Shaia , qemu-devel@nongnu.org On 07/16/2018 10:40 AM, Yuval Shaia wrote: > - Add line counter to ease navigation in log > - Print rdma instead of pvrdma > > Signed-off-by: Yuval Shaia > --- > hw/rdma/rdma_utils.c | 4 ++++ > hw/rdma/rdma_utils.h | 16 ++++++++++++---- > hw/rdma/vmw/pvrdma_main.c | 2 ++ > 3 files changed, 18 insertions(+), 4 deletions(-) > > diff --git a/hw/rdma/rdma_utils.c b/hw/rdma/rdma_utils.c > index d713f635f1..dc23f158f3 100644 > --- a/hw/rdma/rdma_utils.c > +++ b/hw/rdma/rdma_utils.c > @@ -15,6 +15,10 @@ > > #include "rdma_utils.h" > > +#ifdef PVRDMA_DEBUG > +unsigned long pr_dbg_cnt; > +#endif > + > void *rdma_pci_dma_map(PCIDevice *dev, dma_addr_t addr, dma_addr_t plen) > { > void *p; > diff --git a/hw/rdma/rdma_utils.h b/hw/rdma/rdma_utils.h > index 3dc07891bc..04c7c2ef5b 100644 > --- a/hw/rdma/rdma_utils.h > +++ b/hw/rdma/rdma_utils.h > @@ -22,18 +22,26 @@ > #include "sysemu/dma.h" > > #define pr_info(fmt, ...) \ > - fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\ > + fprintf(stdout, "%s: %-20s (%3d): " fmt, "rdma", __func__, __LINE__,\ > ## __VA_ARGS__) > > #define pr_err(fmt, ...) \ > - fprintf(stderr, "%s: Error at %-20s (%3d): " fmt, "pvrdma", __func__, \ > + fprintf(stderr, "%s: Error at %-20s (%3d): " fmt, "rdma", __func__, \ > __LINE__, ## __VA_ARGS__) > > #ifdef PVRDMA_DEBUG > +extern unsigned long pr_dbg_cnt; > + > +#define init_pr_dbg(void) \ > +{ \ > + pr_dbg_cnt = 0; \ > +} > + > #define pr_dbg(fmt, ...) \ > - fprintf(stdout, "%s: %-20s (%3d): " fmt, "pvrdma", __func__, __LINE__,\ > - ## __VA_ARGS__) > + fprintf(stdout, "%lx %ld: %-20s (%3d): " fmt, pthread_self(), pr_dbg_cnt++, \ > + __func__, __LINE__, ## __VA_ARGS__) > #else > +#define init_pr_dbg(void) > #define pr_dbg(fmt, ...) > #endif > > diff --git a/hw/rdma/vmw/pvrdma_main.c b/hw/rdma/vmw/pvrdma_main.c > index 6a5073974d..1b1330e113 100644 > --- a/hw/rdma/vmw/pvrdma_main.c > +++ b/hw/rdma/vmw/pvrdma_main.c > @@ -577,6 +577,8 @@ static void pvrdma_realize(PCIDevice *pdev, Error **errp) > Object *memdev_root; > bool ram_shared = false; > > + init_pr_dbg(); > + > pr_dbg("Initializing device %s %x.%x\n", pdev->name, > PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn)); > Reviewed-by: Marcel Apfelbaum Thanks, Marcel