Commit ef846e02 authored by Yuval Shaia's avatar Yuval Shaia Committed by Marcel Apfelbaum
Browse files

hw/rdma: Modify debug macros 



- Add line counter to ease navigation in log
- Print rdma instead of pvrdma

Signed-off-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel.apfelbaum@gmail.com>
Message-Id: <20180805153518.2983-4-yuval.shaia@oracle.com>
Signed-off-by: default avatarMarcel Apfelbaum <marcel.apfelbaum@gmail.com>
parent b462a134

hw/rdma/rdma_utils.c

+4 −0
Original line number Diff line number Diff line
@@ -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;

hw/rdma/rdma_utils.h

+12 −4
Original line number Diff line number Diff line
@@ -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

hw/rdma/vmw/pvrdma_main.c

+2 −0
Original line number Diff line number Diff line
@@ -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));