Re: [dpdk-dev] [PATCH 37/40] net/virtio: introduce backend data
From: David Marchand <hidden>
Date: 2021-01-05 21:27:00
On Sun, Dec 20, 2020 at 10:16 PM Maxime Coquelin [off-list ref] wrote:
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c index 2fd00afa84..023fddcd69 100644 --- a/drivers/net/virtio/virtio_user/vhost_kernel.c +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c@@ -357,6 +357,12 @@ vhost_kernel_setup(struct virtio_user_dev *dev) return 0; } +static int +vhost_kernel_destroy(struct virtio_user_dev *dev) +{
Missing a __rte_unused.
quoted hunk ↗ jump to hunk
+ return 0; +} + static int vhost_kernel_set_backend(int vhostfd, int tapfd) {@@ -455,6 +461,7 @@ vhost_kernel_get_backend_features(uint64_t *features) struct virtio_user_backend_ops virtio_ops_kernel = { .setup = vhost_kernel_setup, + .destroy = vhost_kernel_destroy, .get_backend_features = vhost_kernel_get_backend_features, .set_owner = vhost_kernel_set_owner, .get_features = vhost_kernel_get_features,
quoted hunk ↗ jump to hunk
diff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c b/drivers/net/virtio/virtio_user/vhost_vdpa.c index c826f333e0..b29426d767 100644 --- a/drivers/net/virtio/virtio_user/vhost_vdpa.c +++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c@@ -287,6 +287,13 @@ vhost_vdpa_setup(struct virtio_user_dev *dev) return 0; } +static int +vhost_vdpa_destroy(struct virtio_user_dev *dev __rte_unused) +{ + return; + return 0;
Rebase damage ? :)
+} +
-- David Marchand