Hi > -----Original Message----- > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of > damarion at cisco.com > Sent: Friday, September 12, 2014 6:25 AM > To: dev at dpdk.org > Subject: [dpdk-dev] [PATCH] virtio: fix crash if VIRTIO_NET_F_CTRL_VQ is not > negotiated > > From: Damjan Marion <damarion at cisco.com> > > If VIRTIO_NET_F_CTRL_VQ is not negotiated hw->cvq will be NULL > > Signed-off-by: Damjan Marion <damarion at cisco.com> > --- > lib/librte_pmd_virtio/virtio_rxtx.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/lib/librte_pmd_virtio/virtio_rxtx.c > b/lib/librte_pmd_virtio/virtio_rxtx.c > index 0b10108..8cb635e 100644 > --- a/lib/librte_pmd_virtio/virtio_rxtx.c > +++ b/lib/librte_pmd_virtio/virtio_rxtx.c > @@ -328,8 +328,10 @@ virtio_dev_cq_start(struct rte_eth_dev *dev) > struct virtio_hw *hw > = VIRTIO_DEV_PRIVATE_TO_HW(dev->data->dev_private); > > - virtio_dev_vring_start(hw->cvq, VTNET_CQ); > - VIRTQUEUE_DUMP((struct virtqueue *)hw->cvq); > + if (hw->cvq) { > + virtio_dev_vring_start(hw->cvq, VTNET_CQ); > + VIRTQUEUE_DUMP((struct virtqueue *)hw->cvq); > + } > } > > void > -- > 2.1.0
Acked-by: Changchun Ouyang <Changchun.ouyang at intel.com>
