Skip to contentSkip to conversation

vhost: delete vhost scsi example

PATCH Superseded Jin Yu 3 participants 7 messages Oct 23, 2019 – Oct 24, 2019 Arm/Amlogic Meson SoC support

lore
Share & tools
lore

Jin Yu

author
#0 lore raw

PATCH 1/1 vhost: delete vhost scsi example

This example is too old and SPDK will not maintain this example anymore. Also SPDK has submitted a new vhost example vhost-blk. We will keep on maintaining vhost-blk and It shows the packed ring and live recovery support.

---
 examples/vhost_scsi/Makefile     |  69 -----
 examples/vhost_scsi/meson.build  |  21 --
 examples/vhost_scsi/scsi.c       | 515 -------------------------------
 examples/vhost_scsi/scsi_spec.h  | 464 ----------------------------
 examples/vhost_scsi/vhost_scsi.c | 487 -----------------------------
 examples/vhost_scsi/vhost_scsi.h |  79 -----
 6 files changed, 1635 deletions(-)
 delete mode 100644 examples/vhost_scsi/Makefile
 delete mode 100644 examples/vhost_scsi/meson.build
 delete mode 100644 examples/vhost_scsi/scsi.c
 delete mode 100644 examples/vhost_scsi/scsi_spec.h
 delete mode 100644 examples/vhost_scsi/vhost_scsi.c
 delete mode 100644 examples/vhost_scsi/vhost_scsi.h
examples/vhost_scsi/Makefile deleted +0 -69
deleted file mode 100644
index 05e1cedb7..000000000
@@ -1,69 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2010-2017 Intel Corporation
-
-# binary name
-APP = vhost-scsi
-
-# all source are stored in SRCS-y
-SRCS-y := scsi.c vhost_scsi.c
-
-# Build using pkg-config variables if possible
-ifeq ($(shell pkg-config --exists libdpdk && echo 0),0)
-
-all: shared
-.PHONY: shared static
-shared: build/$(APP)-shared
-	ln -sf $(APP)-shared build/$(APP)
-static: build/$(APP)-static
-	ln -sf $(APP)-static build/$(APP)
-
-CFLAGS += -D_FILE_OFFSET_BITS=64
-LDFLAGS += -pthread
-
-PKGCONF=pkg-config --define-prefix
-
-PC_FILE := $(shell $(PKGCONF) --path libdpdk)
-CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk)
-LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk)
-LDFLAGS_STATIC = -Wl,-Bstatic $(shell $(PKGCONF) --static --libs libdpdk)
-
-build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build
-	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_SHARED)
-
-build/$(APP)-static: $(SRCS-y) Makefile $(PC_FILE) | build
-	$(CC) $(CFLAGS) $(SRCS-y) -o $@ $(LDFLAGS) $(LDFLAGS_STATIC)
-
-build:
-	@mkdir -p $@
-
-.PHONY: clean
-clean:
-	rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared
-	test -d build && rmdir -p build || true
-
-else # Build using legacy build system
-
-ifeq ($(RTE_SDK),)
-$(error "Please define RTE_SDK environment variable")
-endif
-
-# Default target, detect a build directory, by looking for a path with a .config
-RTE_TARGET ?= $(notdir $(abspath $(dir $(firstword $(wildcard $(RTE_SDK)/*/.config)))))
-
-include $(RTE_SDK)/mk/rte.vars.mk
-
-ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y)
-$(info This application can only operate in a linux environment, \
-please change the definition of the RTE_TARGET environment variable)
-all:
-else
-
-CFLAGS += -DALLOW_EXPERIMENTAL_API
-CFLAGS += -D_FILE_OFFSET_BITS=64
-CFLAGS += -O2
-CFLAGS += $(WERROR_FLAGS)
-
-include $(RTE_SDK)/mk/rte.extapp.mk
-
-endif
-endif
examples/vhost_scsi/meson.build deleted +0 -21
deleted file mode 100644
index 384127d5b..000000000
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-if not is_linux
-	build = false
-endif
-
-if not cc.has_header('linux/virtio_scsi.h')
-	build = false
-endif
-
-deps += 'vhost'
-allow_experimental_apis = true
-sources = files(
-	'scsi.c', 'vhost_scsi.c'
-)
examples/vhost_scsi/scsi.c deleted +0 -515

515 lines not on this page · raw message

examples/vhost_scsi/scsi_spec.h deleted +0 -464

464 lines not on this page · raw message

examples/vhost_scsi/vhost_scsi.c deleted +0 -487

487 lines not on this page · raw message

examples/vhost_scsi/vhost_scsi.h deleted +0 -79

79 lines not on this page · raw message

Signature · 1 line
2.17.2
#1 lore raw
Quoted 7 lines · Jin Yu

This example is too old and SPDK will not maintain this example anymore. Also SPDK has submitted a new vhost example vhost-blk. We will keep on maintaining vhost-blk and It shows the packed ring and live recovery support.

Quoted 14 lines
---
 examples/vhost_scsi/Makefile     |  69 -----
 examples/vhost_scsi/meson.build  |  21 --
 examples/vhost_scsi/scsi.c       | 515 -------------------------------
 examples/vhost_scsi/scsi_spec.h  | 464 ----------------------------
 examples/vhost_scsi/vhost_scsi.c | 487 -----------------------------
 examples/vhost_scsi/vhost_scsi.h |  79 -----
 6 files changed, 1635 deletions(-)
 delete mode 100644 examples/vhost_scsi/Makefile
 delete mode 100644 examples/vhost_scsi/meson.build
 delete mode 100644 examples/vhost_scsi/scsi.c
 delete mode 100644 examples/vhost_scsi/scsi_spec.h
 delete mode 100644 examples/vhost_scsi/vhost_scsi.c
 delete mode 100644 examples/vhost_scsi/vhost_scsi.h

http://mails.dpdk.org/archives/test-report/2019-October/104036.html

Did you check that there is no trace left ?

A quick grep gives me:

$ git grep -l vhost_scsi
MAINTAINERS
doc/guides/sample_app_ug/index.rst
doc/guides/sample_app_ug/vhost_scsi.rst
examples/Makefile
examples/meson.build
examples/vhost_scsi/Makefile
examples/vhost_scsi/meson.build
examples/vhost_scsi/scsi.c
examples/vhost_scsi/vhost_scsi.c
examples/vhost_scsi/vhost_scsi.h
Signature · 1 line
David Marchand
author
#2 lore raw
Quoted 39 lines

-----Original Message-----
From: David Marchand [mailto:[email protected]]
Sent: Wednesday, October 23, 2019 9:52 PM
To: Yu, Jin <[email protected]>
Cc: dev <[email protected]>; Liu, Changpeng <[email protected]>; Maxime Coquelin <[email protected]>; Bie, Tiwei <[email protected]>; Wang, Zhihong <[email protected]>
Subject: Re: [dpdk-dev] [PATCH] vhost: delete vhost scsi example

Quoted 16 lines · Jin Yu

This example is too old and SPDK will not maintain this example anymore. Also SPDK has submitted a new vhost example vhost-blk. We will keep on maintaining vhost-blk and It shows the packed ring and live recovery support.

---
 examples/vhost_scsi/Makefile     |  69 -----
 examples/vhost_scsi/meson.build  |  21 --
 examples/vhost_scsi/scsi.c       | 515 -------------------------------
 examples/vhost_scsi/scsi_spec.h  | 464 ----------------------------
examples/vhost_scsi/vhost_scsi.c | 487 -----------------------------
examples/vhost_scsi/vhost_scsi.h |  79 -----
 6 files changed, 1635 deletions(-)
 delete mode 100644 examples/vhost_scsi/Makefile  delete mode 100644
Quoted 5 lines

examples/vhost_scsi/meson.build delete mode 100644 examples/vhost_scsi/scsi.c delete mode 100644 examples/vhost_scsi/scsi_spec.h delete mode 100644 examples/vhost_scsi/vhost_scsi.c delete mode 100644 examples/vhost_scsi/vhost_scsi.h

http://mails.dpdk.org/archives/test-report/2019-October/104036.html

Did you check that there is no trace left ?

A quick grep gives me:

Quoted 11 lines
$ git grep -l vhost_scsi
MAINTAINERS
doc/guides/sample_app_ug/index.rst
doc/guides/sample_app_ug/vhost_scsi.rst
examples/Makefile
examples/meson.build
examples/vhost_scsi/Makefile
examples/vhost_scsi/meson.build
examples/vhost_scsi/scsi.c
examples/vhost_scsi/vhost_scsi.c
examples/vhost_scsi/vhost_scsi.h

Have fixed it.
Thanks.

Quoted 4 lines

--
David Marchand

author
#3 lore raw

PATCH v2 1/1 vhost: delete vhost scsi example

In reply to Jin Yu

This example is too old and SPDK will not maintain this example anymore. Also SPDK has submitted a new vhost example vhost-blk. We will keep on maintaining vhost-blk and It shows the packed ring and live recovery support.

---
V2 - delete the left trace

---
 MAINTAINERS                             |   2 -
 doc/guides/sample_app_ug/index.rst      |   1 -
 doc/guides/sample_app_ug/vhost_scsi.rst |  77 ----
 examples/Makefile                       |   2 +-
 examples/meson.build                    |   2 +-
 examples/vhost_scsi/Makefile            |  69 ----
 examples/vhost_scsi/meson.build         |  21 -
 examples/vhost_scsi/scsi.c              | 515 ------------------------
 examples/vhost_scsi/scsi_spec.h         | 464 ---------------------
 examples/vhost_scsi/vhost_scsi.c        | 487 ----------------------
 examples/vhost_scsi/vhost_scsi.h        |  79 ----
 11 files changed, 2 insertions(+), 1717 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/vhost_scsi.rst
 delete mode 100644 examples/vhost_scsi/Makefile
 delete mode 100644 examples/vhost_scsi/meson.build
 delete mode 100644 examples/vhost_scsi/scsi.c
 delete mode 100644 examples/vhost_scsi/scsi_spec.h
 delete mode 100644 examples/vhost_scsi/vhost_scsi.c
 delete mode 100644 examples/vhost_scsi/vhost_scsi.h
MAINTAINERS +0 -2
index f8a56e2e2..7a5ac525e 100644
@@ -825,8 +825,6 @@ F: lib/librte_vhost/
 F: doc/guides/prog_guide/vhost_lib.rst
 F: examples/vhost/
 F: doc/guides/sample_app_ug/vhost.rst
-F: examples/vhost_scsi/
-F: doc/guides/sample_app_ug/vhost_scsi.rst
 F: examples/vhost_crypto/
 F: examples/vdpa/
 F: doc/guides/sample_app_ug/vdpa.rst
doc/guides/sample_app_ug/index.rst +0 -1
index f23f8f59e..6f19e5c04 100644
@@ -43,7 +43,6 @@ Sample Applications User Guides
     packet_ordering
     vmdq_dcb_forwarding
     vhost
-    vhost_scsi
     vhost_crypto
     vdpa
     netmap_compatibility
doc/guides/sample_app_ug/vhost_scsi.rst deleted +0 -77

77 lines not on this page · raw message

examples/Makefile +1 -1
index de11dd487..e29572c45 100644
@@ -69,7 +69,7 @@ ifeq ($(CONFIG_RTE_LIBRTE_HASH),y)
 DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += tep_termination
 endif
 DIRS-$(CONFIG_RTE_LIBRTE_TIMER) += timer
-DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost vhost_scsi vdpa
+DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost vdpa
 ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)
 DIRS-$(CONFIG_RTE_LIBRTE_VHOST) += vhost_crypto
 endif
examples/meson.build +1 -1
index a046b74ad..8b483b412 100644
@@ -38,7 +38,7 @@ all_examples = [
 	'skeleton', 'tep_termination',
 	'timer', 'vdpa',
 	'vhost', 'vhost_crypto',
-	'vhost_scsi', 'vm_power_manager',
+	'vm_power_manager',
 	'vmdq', 'vmdq_dcb',
 ]
 # install all example code on install - irrespective of whether the example in
examples/vhost_scsi/Makefile deleted +0 -69

69 lines not on this page · raw message

examples/vhost_scsi/meson.build deleted +0 -21
deleted file mode 100644
index 384127d5b..000000000
@@ -1,21 +0,0 @@
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
-
-# meson file, for building this example as part of a main DPDK build.
-#
-# To build this example as a standalone application with an already-installed
-# DPDK instance, use 'make'
-
-if not is_linux
-	build = false
-endif
-
-if not cc.has_header('linux/virtio_scsi.h')
-	build = false
-endif
-
-deps += 'vhost'
-allow_experimental_apis = true
-sources = files(
-	'scsi.c', 'vhost_scsi.c'
-)
examples/vhost_scsi/scsi.c deleted +0 -515

515 lines not on this page · raw message

examples/vhost_scsi/scsi_spec.h deleted +0 -464

464 lines not on this page · raw message

examples/vhost_scsi/vhost_scsi.c deleted +0 -487

487 lines not on this page · raw message

examples/vhost_scsi/vhost_scsi.h deleted +0 -79

79 lines not on this page · raw message

Signature · 1 line
2.17.2
Reviewed-by on v2 1/1
#4 lore raw
Quoted 20 lines · Jin Yu

This example is too old and SPDK will not maintain this example anymore. Also SPDK has submitted a new vhost example vhost-blk. We will keep on maintaining vhost-blk and It shows the packed ring and live recovery support.

---
V2 - delete the left trace

---
 MAINTAINERS                             |   2 -
 doc/guides/sample_app_ug/index.rst      |   1 -
 doc/guides/sample_app_ug/vhost_scsi.rst |  77 ----
 examples/Makefile                       |   2 +-
 examples/meson.build                    |   2 +-
 examples/vhost_scsi/Makefile            |  69 ----
 examples/vhost_scsi/meson.build         |  21 -
 examples/vhost_scsi/scsi.c              | 515 ------------------------
 examples/vhost_scsi/scsi_spec.h         | 464 ---------------------
 examples/vhost_scsi/vhost_scsi.c        | 487 ----------------------
 examples/vhost_scsi/vhost_scsi.h        |  79 ----
Quoted 8 lines
 11 files changed, 2 insertions(+), 1717 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/vhost_scsi.rst
 delete mode 100644 examples/vhost_scsi/Makefile
 delete mode 100644 examples/vhost_scsi/meson.build
 delete mode 100644 examples/vhost_scsi/scsi.c
 delete mode 100644 examples/vhost_scsi/scsi_spec.h
 delete mode 100644 examples/vhost_scsi/vhost_scsi.c
 delete mode 100644 examples/vhost_scsi/vhost_scsi.h

Thanks,
Maxime

#5 lore raw
Quoted 33 lines · Maxime Coquelin
Quoted 20 lines · Jin Yu

This example is too old and SPDK will not maintain this example anymore. Also SPDK has submitted a new vhost example vhost-blk. We will keep on maintaining vhost-blk and It shows the packed ring and live recovery support.

---
V2 - delete the left trace

---
 MAINTAINERS                             |   2 -
 doc/guides/sample_app_ug/index.rst      |   1 -
 doc/guides/sample_app_ug/vhost_scsi.rst |  77 ----
 examples/Makefile                       |   2 +-
 examples/meson.build                    |   2 +-
 examples/vhost_scsi/Makefile            |  69 ----
 examples/vhost_scsi/meson.build         |  21 -
 examples/vhost_scsi/scsi.c              | 515 ------------------------
 examples/vhost_scsi/scsi_spec.h         | 464 ---------------------
 examples/vhost_scsi/vhost_scsi.c        | 487 ----------------------
 examples/vhost_scsi/vhost_scsi.h        |  79 ----
Quoted 8 lines
 11 files changed, 2 insertions(+), 1717 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/vhost_scsi.rst
 delete mode 100644 examples/vhost_scsi/Makefile
 delete mode 100644 examples/vhost_scsi/meson.build
 delete mode 100644 examples/vhost_scsi/scsi.c
 delete mode 100644 examples/vhost_scsi/scsi_spec.h
 delete mode 100644 examples/vhost_scsi/vhost_scsi.c
 delete mode 100644 examples/vhost_scsi/vhost_scsi.h
Quoted 1 line

Maxime,

When applying, can you add a little note in the release notes to indicate this example removal ?
Thanks.

Signature · 1 line
David Marchand
#6 lore raw
In reply to Maxime Coquelin
Quoted 32 lines · Maxime Coquelin
Quoted 20 lines · Jin Yu

This example is too old and SPDK will not maintain this example anymore. Also SPDK has submitted a new vhost example vhost-blk. We will keep on maintaining vhost-blk and It shows the packed ring and live recovery support.

---
V2 - delete the left trace

---
 MAINTAINERS                             |   2 -
 doc/guides/sample_app_ug/index.rst      |   1 -
 doc/guides/sample_app_ug/vhost_scsi.rst |  77 ----
 examples/Makefile                       |   2 +-
 examples/meson.build                    |   2 +-
 examples/vhost_scsi/Makefile            |  69 ----
 examples/vhost_scsi/meson.build         |  21 -
 examples/vhost_scsi/scsi.c              | 515 ------------------------
 examples/vhost_scsi/scsi_spec.h         | 464 ---------------------
 examples/vhost_scsi/vhost_scsi.c        | 487 ----------------------
 examples/vhost_scsi/vhost_scsi.h        |  79 ----
Quoted 8 lines
 11 files changed, 2 insertions(+), 1717 deletions(-)
 delete mode 100644 doc/guides/sample_app_ug/vhost_scsi.rst
 delete mode 100644 examples/vhost_scsi/Makefile
 delete mode 100644 examples/vhost_scsi/meson.build
 delete mode 100644 examples/vhost_scsi/scsi.c
 delete mode 100644 examples/vhost_scsi/scsi_spec.h
 delete mode 100644 examples/vhost_scsi/vhost_scsi.c
 delete mode 100644 examples/vhost_scsi/vhost_scsi.h
Quoted 5 lines

Thanks,
Maxime

Applied to dpdk-next-virtio/master.

Thanks,
Maxime