[PATCH] virtio: Fix 2 compilation issues in virtio PMD

[PATCH] virtio: Fix 2 compilation issues in virtio PMD

[Ouyang Changchun]

Fix 2 compilation issues in virtio PMD when dump option is enabled.

Signed-off-by: Changchun Ouyang <changchun.ouyang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_pmd_virtio/virtio_ethdev.c | 2 +-
 lib/librte_pmd_virtio/virtqueue.h     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c
index b9f5529..6293ac6 100644
--- a/lib/librte_pmd_virtio/virtio_ethdev.c
+++ b/lib/librte_pmd_virtio/virtio_ethdev.c
@@ -580,7 +580,7 @@ virtio_negotiate_features(struct virtio_hw *hw)
 	/* Prepare guest_features: feature that driver wants to support */
 	hw->guest_features = VTNET_FEATURES & ~mask;
 	PMD_INIT_LOG(DEBUG, "guest_features before negotiate = %x",
-		guest_features);
+		hw->guest_features);
 
 	/* Read device(host) feature bits */
 	host_features = VIRTIO_READ_REG_4(hw, VIRTIO_PCI_HOST_FEATURES);
diff --git a/lib/librte_pmd_virtio/virtqueue.h b/lib/librte_pmd_virtio/virtqueue.h
index 02fe00b..87db35f 100644
--- a/lib/librte_pmd_virtio/virtqueue.h
+++ b/lib/librte_pmd_virtio/virtqueue.h
@@ -269,10 +269,10 @@ virtqueue_notify(struct virtqueue *vq)
 	used_idx = (vq)->vq_ring.used->idx; \
 	nused = (uint16_t)(used_idx - (vq)->vq_used_cons_idx); \
 	PMD_INIT_LOG(DEBUG, \
-	  "VQ: %s - size=%d; free=%d; used=%d; desc_head_idx=%d;" \
+	  "VQ: - size=%d; free=%d; used=%d; desc_head_idx=%d;" \
 	  " avail.idx=%d; used_cons_idx=%d; used.idx=%d;" \
 	  " avail.flags=0x%x; used.flags=0x%x", \
-	  (vq)->vq_name, (vq)->vq_nentries, (vq)->vq_free_cnt, nused, \
+	  (vq)->vq_nentries, (vq)->vq_free_cnt, nused, \
 	  (vq)->vq_desc_head_idx, (vq)->vq_ring.avail->idx, \
 	  (vq)->vq_used_cons_idx, (vq)->vq_ring.used->idx, \
 	  (vq)->vq_ring.avail->flags, (vq)->vq_ring.used->flags); \
-- 
1.8.4.2

Re: [PATCH] virtio: Fix 2 compilation issues in virtio PMD

[Ouyang, Changchun]

Hi all,

> -----Original Message-----
> From: Ouyang, Changchun
> Sent: Thursday, July 24, 2014 12:58 PM
> To: dev-VfR2kkLFssw@public.gmane.org
> Cc: Cao, Waterman; Ouyang, Changchun
> Subject: [PATCH] virtio: Fix 2 compilation issues in virtio PMD
> 
> Fix 2 compilation issues in virtio PMD when dump option is enabled.
> 
> Signed-off-by: Changchun Ouyang <changchun.ouyang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>  lib/librte_pmd_virtio/virtio_ethdev.c | 2 +-
>  lib/librte_pmd_virtio/virtqueue.h     | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 

The offending commit which cause these 2 issues are:

commit f37cdfde46a30d93f3dd8a4e01243be8bc0ac142
Author: Stephen Hemminger <stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.org>	
Date:   Fri Jun 13 18:06:23 2014 -0700
 
    virtio: remove unused virtqueue name
    
    vq_name is only used when setting up queue, and does not need
    to be saved.


commit ce65e697c67ba1a357d806eed05957b3d43f562c
Author: Stephen Hemminger <stephen-OTpzqLSitTUnbdJkjeBofR2eb7JE58TQ@public.gmane.org>
Date:   Fri Jun 13 18:06:25 2014 -0700
 
    virtio: simplify the hardware structure
    
    The host_features are never used after negotiation.
    The PCI information is unused (and available in rte_pci if needed).

Thanks
Changchun

Re: [PATCH] virtio: Fix 2 compilation issues in virtio PMD

[Thomas Monjalon]

2014-07-24 12:57, Ouyang Changchun:
> Fix 2 compilation issues in virtio PMD when dump option is enabled.
> 
> Signed-off-by: Changchun Ouyang <changchun.ouyang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>

Acked-by: Thomas Monjalon <thomas.monjalon-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Applied for version 1.7.1.

Thanks
-- 
Thomas