From e7379fc22f26a25c9c648ecbb535484d3ed7b016 Mon Sep 17 00:00:00 2001 From: Changpeng Liu Date: Thu, 19 Dec 2019 02:29:39 -0500 Subject: [PATCH] virtio: remove VHOST_USER_F_PROTOCOL_FEATURES from virtio.h spdk_internal/vhost_user.h head file defines common vhost user protocol, and it can be used both in the vhost target and virtio initiator, so remove the definition from virtio.h. Change-Id: I1fac1cb5a16f803cd0d49962c07d2179f881c76a Signed-off-by: Changpeng Liu Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/478411 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- include/spdk_internal/virtio.h | 4 ---- module/bdev/virtio/bdev_virtio_blk.c | 1 + module/bdev/virtio/bdev_virtio_scsi.c | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/spdk_internal/virtio.h b/include/spdk_internal/virtio.h index 777440292..c30013efe 100644 --- a/include/spdk_internal/virtio.h +++ b/include/spdk_internal/virtio.h @@ -48,10 +48,6 @@ #include "spdk/pci_ids.h" #include "spdk/env.h" -#ifndef VHOST_USER_F_PROTOCOL_FEATURES -#define VHOST_USER_F_PROTOCOL_FEATURES 30 -#endif - /** * The maximum virtqueue size is 2^15. Use that value as the end of * descriptor chain terminator since it will never be a valid index diff --git a/module/bdev/virtio/bdev_virtio_blk.c b/module/bdev/virtio/bdev_virtio_blk.c index bc4dc9b8e..6f6802c79 100644 --- a/module/bdev/virtio/bdev_virtio_blk.c +++ b/module/bdev/virtio/bdev_virtio_blk.c @@ -46,6 +46,7 @@ #include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "spdk_internal/virtio.h" +#include "spdk_internal/vhost_user.h" #include diff --git a/module/bdev/virtio/bdev_virtio_scsi.c b/module/bdev/virtio/bdev_virtio_scsi.c index 76f878e2b..32719b40f 100644 --- a/module/bdev/virtio/bdev_virtio_scsi.c +++ b/module/bdev/virtio/bdev_virtio_scsi.c @@ -46,6 +46,7 @@ #include "spdk/bdev_module.h" #include "spdk_internal/log.h" #include "spdk_internal/virtio.h" +#include "spdk_internal/vhost_user.h" #include