1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build

Laurent Vivier posted 1 patch 5 years, 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20180605135404.16301-1-laurent@vivier.eu
There is a newer version of this series
Makefile               | 2 ++
tests/Makefile.include | 2 ++
2 files changed, 4 insertions(+)
[Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build
Posted by Laurent Vivier 5 years, 10 months ago 
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
Re: [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build
Posted by Peter Maydell 5 years, 10 months ago 
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
Re: [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build
Posted by Laurent Vivier 5 years, 10 months ago 
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

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.