]> git.droids-corp.org - dpdk.git/commitdiff
net/virtio-user: do not stop stopped device again
authorTiwei Bie <tiwei.bie@intel.com>
Mon, 29 Oct 2018 05:28:03 +0000 (13:28 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Mon, 5 Nov 2018 14:01:25 +0000 (15:01 +0100)
Without this change, virtio-user still works, but it will show
annoying error messages like this on shutdown:

vhost_kernel_set_backend(): VHOST_NET_SET_BACKEND fails, Operation not permitted
vhost_kernel_ioctl(): VHOST_RESET_OWNER failed: Operation not permitted

Fixes: e3b434818bbb ("net/virtio-user: support kernel vhost")
Fixes: 12ecb2f63b12 ("net/virtio-user: support memory hotplug")
Cc: stable@dpdk.org
Reported-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
drivers/net/virtio/virtio_user/virtio_user_dev.c

index b4997ee3f7fcce7ef33b9562e045d6f7769b2342..0e3563051395f124ec0d56602e320b074cbfc7fc 100644 (file)
@@ -184,6 +184,9 @@ int virtio_user_stop_device(struct virtio_user_dev *dev)
        uint32_t i;
 
        pthread_mutex_lock(&dev->mutex);
+       if (!dev->started)
+               goto out;
+
        for (i = 0; i < dev->max_queue_pairs; ++i)
                dev->ops->enable_qp(dev, i, 0);
 
@@ -193,6 +196,7 @@ int virtio_user_stop_device(struct virtio_user_dev *dev)
                return -1;
        }
        dev->started = false;
+out:
        pthread_mutex_unlock(&dev->mutex);
 
        return 0;