Signed-off-by: Jianfeng Tan <jianfeng....@intel.com>
---
 drivers/net/virtio/virtio_user/virtio_user_dev.c |  1 +
 drivers/net/virtio/virtio_user_ethdev.c          | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c 
b/drivers/net/virtio/virtio_user/virtio_user_dev.c
index 9777d6b..cc6f557 100644
--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c
+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c
@@ -176,6 +176,7 @@ virtio_user_start_device(struct virtio_user_dev *dev, 
uint8_t portid)
        features &= ~(1ull << VIRTIO_NET_F_MAC);
        /* Strip VIRTIO_NET_F_CTRL_VQ, as devices do not really need to know */
        features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);
+       features &= ~(1ull << VIRTIO_NET_F_STATUS);
        ret = dev->ops->send_request(dev, VHOST_USER_SET_FEATURES, &features);
        if (ret < 0)
                goto error;
diff --git a/drivers/net/virtio/virtio_user_ethdev.c 
b/drivers/net/virtio/virtio_user_ethdev.c
index fa79419..fbdd0a8 100644
--- a/drivers/net/virtio/virtio_user_ethdev.c
+++ b/drivers/net/virtio/virtio_user_ethdev.c
@@ -121,7 +121,8 @@ virtio_user_get_features(struct virtio_hw *hw)
        struct virtio_user_dev *dev = virtio_user_get_dev(hw);
 
        /* unmask feature bits defined in vhost user protocol */
-       return dev->device_features & VIRTIO_PMD_SUPPORTED_GUEST_FEATURES;
+       return (dev->device_features | (1 << VIRTIO_NET_F_STATUS))
+               & VIRTIO_PMD_SUPPORTED_GUEST_FEATURES;
 }
 
 static void
@@ -129,23 +130,23 @@ virtio_user_set_features(struct virtio_hw *hw, uint64_t 
features)
 {
        struct virtio_user_dev *dev = virtio_user_get_dev(hw);
 
-       dev->features = features & dev->device_features;
+       dev->features = features;
 }
 
 static uint8_t
 virtio_user_get_isr(struct virtio_hw *hw __rte_unused)
 {
-       /* When config interrupt happens, driver calls this function to query
-        * what kinds of change happen. Interrupt mode not supported for now.
+       /* rxq interrupts and config interrupt are separated in virtio-user,
+        * here we only report config change.
         */
-       return 0;
+       return VIRTIO_PCI_ISR_CONFIG;
 }
 
 static uint16_t
 virtio_user_set_config_irq(struct virtio_hw *hw __rte_unused,
                    uint16_t vec __rte_unused)
 {
-       return VIRTIO_MSI_NO_VECTOR;
+       return 0;
 }
 
 static uint16_t
-- 
2.7.4

Reply via email to