From e4836026ab59ae1b43d9133d194ae132d6bf11a3 Mon Sep 17 00:00:00 2001
From: Changpeng Liu <changpeng.liu@intel.com>
Date: Mon, 9 Dec 2019 02:46:59 -0500
Subject: [PATCH] vhost: remove VIRTIO_F_VERSION_1 definition from
 vhost_internal.h

VIRTIO_F_VERSION_1 is defined in system header file <linux/virtio_config.h> and
SPDK already included a copy of it.

Change-Id: I88d5206c7b0984382b3fed1d062d971a014a85a8
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477224
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
---
 lib/vhost/vhost_internal.h | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/vhost/vhost_internal.h b/lib/vhost/vhost_internal.h
index 413abf0ac..387194414 100644
--- a/lib/vhost/vhost_internal.h
+++ b/lib/vhost/vhost_internal.h
@@ -33,6 +33,7 @@
 
 #ifndef SPDK_VHOST_INTERNAL_H
 #define SPDK_VHOST_INTERNAL_H
+#include <linux/virtio_config.h>
 
 #include "spdk/stdinc.h"
 
@@ -46,10 +47,6 @@
 
 #define SPDK_CACHE_LINE_SIZE RTE_CACHE_LINE_SIZE
 
-#ifndef VIRTIO_F_VERSION_1
-#define VIRTIO_F_VERSION_1 32
-#endif
-
 #define SPDK_VHOST_MAX_VQUEUES	256
 #define SPDK_VHOST_MAX_VQ_SIZE	1024