* [Qemu-devel] [PATCH] tests/Makefile: Only run vhost-user-test on Linux
@ 2014-07-15 17:35 Peter Maydell
2014-07-15 20:15 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2014-07-15 17:35 UTC (permalink / raw)
To: qemu-devel; +Cc: Nikolay Nikolaev, Michael S. Tsirkin
vhost-user-test uses the linux/vhost.h header, so it must only be
enabled if CONFIG_LINUX is defined. (Previously it was enabled
for CONFIG_POSIX, which broke 'make check' on MacOSX.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
I'm going to commit this for the 2.1-rc2 tag I'm about to do,
since it's such a trivial change...
tests/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/Makefile b/tests/Makefile
index 1fcd633..fa25c70 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -158,7 +158,7 @@ gcov-files-i386-y += hw/usb/hcd-ehci.c
gcov-files-i386-y += hw/usb/hcd-uhci.c
gcov-files-i386-y += hw/usb/dev-hid.c
gcov-files-i386-y += hw/usb/dev-storage.c
-check-qtest-i386-$(CONFIG_POSIX) += tests/vhost-user-test$(EXESUF)
+check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF)
check-qtest-x86_64-y = $(check-qtest-i386-y)
gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] tests/Makefile: Only run vhost-user-test on Linux
2014-07-15 17:35 [Qemu-devel] [PATCH] tests/Makefile: Only run vhost-user-test on Linux Peter Maydell
@ 2014-07-15 20:15 ` Paolo Bonzini
2014-07-15 20:30 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Paolo Bonzini @ 2014-07-15 20:15 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Nikolay Nikolaev, Michael S. Tsirkin
Il 15/07/2014 19:35, Peter Maydell ha scritto:
> vhost-user-test uses the linux/vhost.h header, so it must only be
> enabled if CONFIG_LINUX is defined. (Previously it was enabled
> for CONFIG_POSIX, which broke 'make check' on MacOSX.)
>
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> I'm going to commit this for the 2.1-rc2 tag I'm about to do,
> since it's such a trivial change...
Yes, the right thing to do is probably to distribute linux/vhost.h but
it's 2.2 material.
Paolo
> tests/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/Makefile b/tests/Makefile
> index 1fcd633..fa25c70 100644
> --- a/tests/Makefile
> +++ b/tests/Makefile
> @@ -158,7 +158,7 @@ gcov-files-i386-y += hw/usb/hcd-ehci.c
> gcov-files-i386-y += hw/usb/hcd-uhci.c
> gcov-files-i386-y += hw/usb/dev-hid.c
> gcov-files-i386-y += hw/usb/dev-storage.c
> -check-qtest-i386-$(CONFIG_POSIX) += tests/vhost-user-test$(EXESUF)
> +check-qtest-i386-$(CONFIG_LINUX) += tests/vhost-user-test$(EXESUF)
> check-qtest-x86_64-y = $(check-qtest-i386-y)
> gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
> gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH] tests/Makefile: Only run vhost-user-test on Linux
2014-07-15 20:15 ` Paolo Bonzini
@ 2014-07-15 20:30 ` Peter Maydell
0 siblings, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2014-07-15 20:30 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers, Nikolay Nikolaev, Michael S. Tsirkin
On 15 July 2014 21:15, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 15/07/2014 19:35, Peter Maydell ha scritto:
>
>> vhost-user-test uses the linux/vhost.h header, so it must only be
>> enabled if CONFIG_LINUX is defined. (Previously it was enabled
>> for CONFIG_POSIX, which broke 'make check' on MacOSX.)
>>
>> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>> ---
>> I'm going to commit this for the 2.1-rc2 tag I'm about to do,
>> since it's such a trivial change...
>
>
> Yes, the right thing to do is probably to distribute linux/vhost.h but it's
> 2.2 material.
That's tricky unless the kernel folks are going to guarantee
that they'll keep that header compilable on every host OS
we support... (I have a similar issue with psci.h, so if you have
a solution to this I'd like to use it there too.)
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-07-15 20:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-15 17:35 [Qemu-devel] [PATCH] tests/Makefile: Only run vhost-user-test on Linux Peter Maydell
2014-07-15 20:15 ` Paolo Bonzini
2014-07-15 20:30 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).