* [PATCH 1/2] tests/vhost-user-bridge: move to contrib/
@ 2020-02-06 17:36 Laurent Vivier
2020-02-06 17:36 ` [PATCH 2/2] virtiofsd: add it to the tools list Laurent Vivier
2020-02-06 18:18 ` [PATCH 1/2] tests/vhost-user-bridge: move to contrib/ Philippe Mathieu-Daudé
0 siblings, 2 replies; 4+ messages in thread
From: Laurent Vivier @ 2020-02-06 17:36 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Marc-André Lureau, Dr . David Alan Gilbert,
Stefan Hajnoczi, Michael S . Tsirkin
vhost-user-bridge is not a test. Move it to contrib/ and
add it to the tools list.
It will be built only if tools (--enable-tools) and
vhost-user (--enable-vhost-user) are enabled (both are set
by default).
Suggested-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
Makefile | 3 +++
Makefile.objs | 1 +
configure | 3 +++
contrib/vhost-user-bridge/Makefile.objs | 1 +
tests/vhost-user-bridge.c => contrib/vhost-user-bridge/main.c | 0
tests/Makefile.include | 1 -
6 files changed, 8 insertions(+), 1 deletion(-)
create mode 100644 contrib/vhost-user-bridge/Makefile.objs
rename tests/vhost-user-bridge.c => contrib/vhost-user-bridge/main.c (100%)
diff --git a/Makefile b/Makefile
index 461d40bea6c2..23342a433e11 100644
--- a/Makefile
+++ b/Makefile
@@ -442,6 +442,7 @@ dummy := $(call unnest-vars,, \
libvhost-user-obj-y \
vhost-user-scsi-obj-y \
vhost-user-blk-obj-y \
+ vhost-user-bridge-obj-y \
vhost-user-input-obj-y \
vhost-user-gpu-obj-y \
qga-vss-dll-obj-y \
@@ -672,6 +673,8 @@ vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a
$(call LINK, $^)
vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a
$(call LINK, $^)
+vhost-user-bridge$(EXESUF): $(vhost-user-bridge-obj-y) libvhost-user.a
+ $(call LINK, $^)
rdmacm-mux$(EXESUF): LIBS += "-libumad"
rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
diff --git a/Makefile.objs b/Makefile.objs
index 26b9cff95436..0240100b9a17 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -109,6 +109,7 @@ vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
vhost-user-blk-obj-y = contrib/vhost-user-blk/
+vhost-user-bridge-obj-y = contrib/vhost-user-bridge/
rdmacm-mux-obj-y = contrib/rdmacm-mux/
vhost-user-input-obj-y = contrib/vhost-user-input/
vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
diff --git a/configure b/configure
index 115dc38085f3..0415eb5c99d3 100755
--- a/configure
+++ b/configure
@@ -6223,6 +6223,9 @@ if test "$want_tools" = "yes" ; then
if [ "$curl" = "yes" ]; then
tools="elf2dmp\$(EXESUF) $tools"
fi
+ if [ "$vhost_user" = "yes" ]; then
+ tools="vhost-user-bridge\$(EXESUF) $tools"
+ fi
fi
if test "$softmmu" = yes ; then
if test "$linux" = yes; then
diff --git a/contrib/vhost-user-bridge/Makefile.objs b/contrib/vhost-user-bridge/Makefile.objs
new file mode 100644
index 000000000000..36a8d9b49a05
--- /dev/null
+++ b/contrib/vhost-user-bridge/Makefile.objs
@@ -0,0 +1 @@
+vhost-user-bridge-obj-y = main.o
diff --git a/tests/vhost-user-bridge.c b/contrib/vhost-user-bridge/main.c
similarity index 100%
rename from tests/vhost-user-bridge.c
rename to contrib/vhost-user-bridge/main.c
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 2f1cafed720d..78cdbe91aed5 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -586,7 +586,6 @@ include $(SRC_PATH)/tests/qtest/Makefile.include
tests/test-qga$(EXESUF): qemu-ga$(EXESUF)
tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
-tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
SPEED = quick
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] virtiofsd: add it to the tools list
2020-02-06 17:36 [PATCH 1/2] tests/vhost-user-bridge: move to contrib/ Laurent Vivier
@ 2020-02-06 17:36 ` Laurent Vivier
2020-02-06 17:41 ` Dr. David Alan Gilbert
2020-02-06 18:18 ` [PATCH 1/2] tests/vhost-user-bridge: move to contrib/ Philippe Mathieu-Daudé
1 sibling, 1 reply; 4+ messages in thread
From: Laurent Vivier @ 2020-02-06 17:36 UTC (permalink / raw)
To: qemu-devel
Cc: Laurent Vivier, Marc-André Lureau, Dr . David Alan Gilbert,
Stefan Hajnoczi, Michael S . Tsirkin
it will be built only when tools are enabled (always enabled by default)
Signed-off-by: Laurent Vivier <lvivier@redhat.com>
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 23342a433e11..484fbb737858 100644
--- a/Makefile
+++ b/Makefile
@@ -327,7 +327,7 @@ HELPERS-y += vhost-user-gpu$(EXESUF)
vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
endif
-ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
+ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_TOOLS),yyyy)
HELPERS-y += virtiofsd$(EXESUF)
vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json
endif
@@ -681,7 +681,7 @@ rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
$(call LINK, $^)
# relies on Linux-specific syscalls
-ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
+ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_TOOLS),yyyy)
virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS)
$(call LINK, $^)
endif
--
2.24.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] virtiofsd: add it to the tools list
2020-02-06 17:36 ` [PATCH 2/2] virtiofsd: add it to the tools list Laurent Vivier
@ 2020-02-06 17:41 ` Dr. David Alan Gilbert
0 siblings, 0 replies; 4+ messages in thread
From: Dr. David Alan Gilbert @ 2020-02-06 17:41 UTC (permalink / raw)
To: Laurent Vivier
Cc: Marc-André Lureau, qemu-devel, Stefan Hajnoczi, Michael S . Tsirkin
* Laurent Vivier (lvivier@redhat.com) wrote:
> it will be built only when tools are enabled (always enabled by default)
>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 23342a433e11..484fbb737858 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -327,7 +327,7 @@ HELPERS-y += vhost-user-gpu$(EXESUF)
> vhost-user-json-y += contrib/vhost-user-gpu/50-qemu-gpu.json
> endif
>
> -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
> +ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_TOOLS),yyyy)
> HELPERS-y += virtiofsd$(EXESUF)
> vhost-user-json-y += tools/virtiofsd/50-qemu-virtiofsd.json
> endif
> @@ -681,7 +681,7 @@ rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
> $(call LINK, $^)
>
> # relies on Linux-specific syscalls
> -ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG),yyy)
> +ifeq ($(CONFIG_LINUX)$(CONFIG_SECCOMP)$(CONFIG_LIBCAP_NG)$(CONFIG_TOOLS),yyyy)
> virtiofsd$(EXESUF): $(virtiofsd-obj-y) libvhost-user.a $(COMMON_LDADDS)
> $(call LINK, $^)
> endif
> --
> 2.24.1
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] tests/vhost-user-bridge: move to contrib/
2020-02-06 17:36 [PATCH 1/2] tests/vhost-user-bridge: move to contrib/ Laurent Vivier
2020-02-06 17:36 ` [PATCH 2/2] virtiofsd: add it to the tools list Laurent Vivier
@ 2020-02-06 18:18 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-02-06 18:18 UTC (permalink / raw)
To: Laurent Vivier, qemu-devel
Cc: Marc-André Lureau, Dr . David Alan Gilbert, Stefan Hajnoczi,
Michael S . Tsirkin
On 2/6/20 6:36 PM, Laurent Vivier wrote:
> vhost-user-bridge is not a test. Move it to contrib/ and
> add it to the tools list.
>
> It will be built only if tools (--enable-tools) and
> vhost-user (--enable-vhost-user) are enabled (both are set
> by default).
>
> Suggested-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>
> ---
> Makefile | 3 +++
> Makefile.objs | 1 +
> configure | 3 +++
> contrib/vhost-user-bridge/Makefile.objs | 1 +
> tests/vhost-user-bridge.c => contrib/vhost-user-bridge/main.c | 0
> tests/Makefile.include | 1 -
> 6 files changed, 8 insertions(+), 1 deletion(-)
> create mode 100644 contrib/vhost-user-bridge/Makefile.objs
> rename tests/vhost-user-bridge.c => contrib/vhost-user-bridge/main.c (100%)
Please update the comment in docs/devel/migration.rst too:
... and the `vhost-user-bridge` (in `tests/`) and ...
by "(in `contrib/`)".
With docs/devel/migration.rst updated:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> diff --git a/Makefile b/Makefile
> index 461d40bea6c2..23342a433e11 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -442,6 +442,7 @@ dummy := $(call unnest-vars,, \
> libvhost-user-obj-y \
> vhost-user-scsi-obj-y \
> vhost-user-blk-obj-y \
> + vhost-user-bridge-obj-y \
> vhost-user-input-obj-y \
> vhost-user-gpu-obj-y \
> qga-vss-dll-obj-y \
> @@ -672,6 +673,8 @@ vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a
> $(call LINK, $^)
> vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a
> $(call LINK, $^)
> +vhost-user-bridge$(EXESUF): $(vhost-user-bridge-obj-y) libvhost-user.a
> + $(call LINK, $^)
>
> rdmacm-mux$(EXESUF): LIBS += "-libumad"
> rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS)
> diff --git a/Makefile.objs b/Makefile.objs
> index 26b9cff95436..0240100b9a17 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -109,6 +109,7 @@ vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS)
> vhost-user-scsi.o-libs := $(LIBISCSI_LIBS)
> vhost-user-scsi-obj-y = contrib/vhost-user-scsi/
> vhost-user-blk-obj-y = contrib/vhost-user-blk/
> +vhost-user-bridge-obj-y = contrib/vhost-user-bridge/
> rdmacm-mux-obj-y = contrib/rdmacm-mux/
> vhost-user-input-obj-y = contrib/vhost-user-input/
> vhost-user-gpu-obj-y = contrib/vhost-user-gpu/
> diff --git a/configure b/configure
> index 115dc38085f3..0415eb5c99d3 100755
> --- a/configure
> +++ b/configure
> @@ -6223,6 +6223,9 @@ if test "$want_tools" = "yes" ; then
> if [ "$curl" = "yes" ]; then
> tools="elf2dmp\$(EXESUF) $tools"
> fi
> + if [ "$vhost_user" = "yes" ]; then
> + tools="vhost-user-bridge\$(EXESUF) $tools"
> + fi
> fi
> if test "$softmmu" = yes ; then
> if test "$linux" = yes; then
> diff --git a/contrib/vhost-user-bridge/Makefile.objs b/contrib/vhost-user-bridge/Makefile.objs
> new file mode 100644
> index 000000000000..36a8d9b49a05
> --- /dev/null
> +++ b/contrib/vhost-user-bridge/Makefile.objs
> @@ -0,0 +1 @@
> +vhost-user-bridge-obj-y = main.o
> diff --git a/tests/vhost-user-bridge.c b/contrib/vhost-user-bridge/main.c
> similarity index 100%
> rename from tests/vhost-user-bridge.c
> rename to contrib/vhost-user-bridge/main.c
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 2f1cafed720d..78cdbe91aed5 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -586,7 +586,6 @@ include $(SRC_PATH)/tests/qtest/Makefile.include
>
> tests/test-qga$(EXESUF): qemu-ga$(EXESUF)
> tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
> -tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
>
> SPEED = quick
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-06 18:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-06 17:36 [PATCH 1/2] tests/vhost-user-bridge: move to contrib/ Laurent Vivier
2020-02-06 17:36 ` [PATCH 2/2] virtiofsd: add it to the tools list Laurent Vivier
2020-02-06 17:41 ` Dr. David Alan Gilbert
2020-02-06 18:18 ` [PATCH 1/2] tests/vhost-user-bridge: move to contrib/ Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.