* [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build
@ 2018-06-05 13:54 Laurent Vivier
2018-06-05 14:00 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Laurent Vivier @ 2018-06-05 13:54 UTC (permalink / raw)
To: qemu-devel
Cc: Daniel P . Berrangé,
Peter Maydell, Richard Henderson, Laurent Vivier
linux-user targets don't need them, and if we ask to build statically
linked binaries some static binaries they need are not available.
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
Makefile | 2 ++
tests/Makefile.include | 2 ++
2 files changed, 4 insertions(+)
diff --git a/Makefile b/Makefile
index 6d588d1f71..5f198ee4bb 100644
--- a/Makefile
+++ b/Makefile
@@ -351,7 +351,9 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
+ifeq ($(CONFIG_SOFTMMU),y)
HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
+endif
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 86f90c0cb0..adaa5274c8 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -923,7 +923,9 @@ check-report.html: check-report.xml
# Other tests
+ifeq ($(CONFIG_SOFTMMU),y)
QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
+endif
.PHONY: check-tests/qemu-iotests-quick.sh
check-tests/qemu-iotests-quick.sh: tests/qemu-iotests-quick.sh qemu-img$(EXESUF) qemu-io$(EXESUF) $(QEMU_IOTESTS_HELPERS-y)
--
2.14.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build
2018-06-05 13:54 [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build Laurent Vivier
@ 2018-06-05 14:00 ` Peter Maydell
2018-06-05 15:38 ` Laurent Vivier
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2018-06-05 14:00 UTC (permalink / raw)
To: Laurent Vivier
Cc: QEMU Developers, Daniel P . Berrangé, Richard Henderson
On 5 June 2018 at 14:54, Laurent Vivier <laurent@vivier.eu> wrote:
> linux-user targets don't need them, and if we ask to build statically
> linked binaries some static binaries they need are not available.
>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
> Makefile | 2 ++
> tests/Makefile.include | 2 ++
> 2 files changed, 4 insertions(+)
>
> diff --git a/Makefile b/Makefile
> index 6d588d1f71..5f198ee4bb 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -351,7 +351,9 @@ $(call set-vpath, $(SRC_PATH))
>
> LIBS+=-lz $(LIBS_TOOLS)
>
> +ifeq ($(CONFIG_SOFTMMU),y)
> HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
> +endif
HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =
qemu-bridge-helper$(EXESUF)
?
> ifdef BUILD_DOCS
> DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 86f90c0cb0..adaa5274c8 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -923,7 +923,9 @@ check-report.html: check-report.xml
>
> # Other tests
>
> +ifeq ($(CONFIG_SOFTMMU),y)
> QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
> +endif
Do we also need to do something to ensure that the tests that
use this helper don't run, or does that happen automatically?
thanks
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build
2018-06-05 14:00 ` Peter Maydell
@ 2018-06-05 15:38 ` Laurent Vivier
0 siblings, 0 replies; 3+ messages in thread
From: Laurent Vivier @ 2018-06-05 15:38 UTC (permalink / raw)
To: Peter Maydell
Cc: QEMU Developers, Daniel P . Berrangé, Richard Henderson
Le 05/06/2018 à 16:00, Peter Maydell a écrit :
> On 5 June 2018 at 14:54, Laurent Vivier <laurent@vivier.eu> wrote:
>> linux-user targets don't need them, and if we ask to build statically
>> linked binaries some static binaries they need are not available.
>>
>> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
>> ---
>> Makefile | 2 ++
>> tests/Makefile.include | 2 ++
>> 2 files changed, 4 insertions(+)
>>
>> diff --git a/Makefile b/Makefile
>> index 6d588d1f71..5f198ee4bb 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -351,7 +351,9 @@ $(call set-vpath, $(SRC_PATH))
>>
>> LIBS+=-lz $(LIBS_TOOLS)
>>
>> +ifeq ($(CONFIG_SOFTMMU),y)
>> HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
>> +endif
>
> HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) =
> qemu-bridge-helper$(EXESUF)
>
I can try that.
>
>> ifdef BUILD_DOCS
>> DOCS=qemu-doc.html qemu-doc.txt qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index 86f90c0cb0..adaa5274c8 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -923,7 +923,9 @@ check-report.html: check-report.xml
>>
>> # Other tests
>>
>> +ifeq ($(CONFIG_SOFTMMU),y)
>> QEMU_IOTESTS_HELPERS-$(CONFIG_LINUX) = tests/qemu-iotests/socket_scm_helper$(EXESUF)
>> +endif
>
> Do we also need to do something to ensure that the tests that
> use this helper don't run, or does that happen automatically?
I don't think iotests can run if no machine is configured.
qemu-iotests needs *-softmmu targets, see in tests/qemu-iotests/check
If I tried a "make check-block" with --disable-system it fails with
.../tests/qemu-iotests-quick.sh
check: qemu not found
Thanks,
Laurent
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-05 15:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-05 13:54 [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build Laurent Vivier
2018-06-05 14:00 ` Peter Maydell
2018-06-05 15:38 ` Laurent Vivier
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.