[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and sock
From: |
Laurent Vivier |
Subject: |
Re: [Qemu-devel] [PATCH] linux-user: disable qemu-bridge-helper and socket_scm_helper build |
Date: |
Tue, 5 Jun 2018 17:38:56 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 |
Le 05/06/2018 à 16:00, Peter Maydell a écrit :
> On 5 June 2018 at 14:54, Laurent Vivier <address@hidden> 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 <address@hidden>
>> ---
>> 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