From 329d5510e9272000f74eaaf213da0c7495f7df19 Mon Sep 17 00:00:00 2001
From: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Date: Fri, 26 May 2017 15:24:31 +0200
Subject: [PATCH] vhost: move not SCSI specific parts to internal header
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
Change-Id: Id17bf80c19ab05e42db094d4901b06a9bdbe7560
Reviewed-on: https://review.gerrithub.io/363089
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Piotr Pelpliński <piotr.pelplinski@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
---
 lib/vhost/vhost_internal.h | 8 ++++++++
 lib/vhost/vhost_scsi.c     | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/vhost/vhost_internal.h b/lib/vhost/vhost_internal.h
index d3bf0aada1..fbb6416b45 100644
--- a/lib/vhost/vhost_internal.h
+++ b/lib/vhost/vhost_internal.h
@@ -43,6 +43,14 @@
 
 #define SPDK_CACHE_LINE_SIZE RTE_CACHE_LINE_SIZE
 
+#ifndef VHOST_USER_F_PROTOCOL_FEATURES
+#define VHOST_USER_F_PROTOCOL_FEATURES	30
+#endif
+
+#ifndef VIRTIO_F_VERSION_1
+#define VIRTIO_F_VERSION_1 32
+#endif
+
 #define MAX_VHOST_VRINGS	256
 
 enum spdk_vhost_dev_type {
diff --git a/lib/vhost/vhost_scsi.c b/lib/vhost/vhost_scsi.c
index d935b74460..6021326afa 100644
--- a/lib/vhost/vhost_scsi.c
+++ b/lib/vhost/vhost_scsi.c
@@ -33,7 +33,6 @@
 
 #include "spdk/stdinc.h"
 
-#include <linux/virtio_ring.h>
 #include <linux/virtio_scsi.h>
 
 #include "spdk/env.h"
@@ -46,12 +45,6 @@
 #include "vhost_scsi.h"
 #include "task.h"
 
-#ifndef VIRTIO_F_VERSION_1
-#define VIRTIO_F_VERSION_1 32
-#endif
-
-#define VHOST_USER_F_PROTOCOL_FEATURES	30
-
 /* Features supported by SPDK VHOST lib. */
 #define SPDK_VHOST_SCSI_FEATURES	((1ULL << VIRTIO_F_VERSION_1) | \
 					(1ULL << VHOST_F_LOG_ALL) | \