* [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module
@ 2019-08-22 17:42 Paolo Bonzini
2019-08-23 7:32 ` Marc-André Lureau
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Paolo Bonzini @ 2019-08-22 17:42 UTC (permalink / raw)
To: qemu-devel; +Cc: marcandre.lureau, peter.maydell
$(call land, $(CONFIG_SPICE), $(CONFIG_GIO)) will never return "m" so
ui-spice-app is always linked into QEMU.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/modules-test.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tests/modules-test.c b/tests/modules-test.c
index a8118e9..f9de3af 100644
--- a/tests/modules-test.c
+++ b/tests/modules-test.c
@@ -53,9 +53,6 @@ int main(int argc, char *argv[])
#ifdef CONFIG_SDL
"ui-", "sdl",
#endif
-#if defined(CONFIG_SPICE) && defined(CONFIG_GIO)
- "ui-", "spice-app",
-#endif
};
int i;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module
2019-08-22 17:42 [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module Paolo Bonzini
@ 2019-08-23 7:32 ` Marc-André Lureau
2019-08-23 12:03 ` Paolo Bonzini
2019-08-23 12:32 ` Miroslav Rezanina
2019-08-23 14:13 ` Peter Maydell
2 siblings, 1 reply; 5+ messages in thread
From: Marc-André Lureau @ 2019-08-23 7:32 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Peter Maydell, QEMU
On Thu, Aug 22, 2019 at 9:43 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> $(call land, $(CONFIG_SPICE), $(CONFIG_GIO)) will never return "m" so
> ui-spice-app is always linked into QEMU.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
I would rather build the module:
-common-obj-$(call land,$(CONFIG_SPICE),$(CONFIG_GIO)) += spice-app.mo
+ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy)
+common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo
+endif
> ---
> tests/modules-test.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/tests/modules-test.c b/tests/modules-test.c
> index a8118e9..f9de3af 100644
> --- a/tests/modules-test.c
> +++ b/tests/modules-test.c
> @@ -53,9 +53,6 @@ int main(int argc, char *argv[])
> #ifdef CONFIG_SDL
> "ui-", "sdl",
> #endif
> -#if defined(CONFIG_SPICE) && defined(CONFIG_GIO)
> - "ui-", "spice-app",
> -#endif
> };
> int i;
>
> --
> 1.8.3.1
>
>
--
Marc-André Lureau
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module
2019-08-23 7:32 ` Marc-André Lureau
@ 2019-08-23 12:03 ` Paolo Bonzini
0 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2019-08-23 12:03 UTC (permalink / raw)
To: Marc-André Lureau; +Cc: Peter Maydell, QEMU
On 23/08/19 09:32, Marc-André Lureau wrote:
> On Thu, Aug 22, 2019 at 9:43 PM Paolo Bonzini <pbonzini@redhat.com> wrote:
>>
>> $(call land, $(CONFIG_SPICE), $(CONFIG_GIO)) will never return "m" so
>> ui-spice-app is always linked into QEMU.
>>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
> I would rather build the module:
> -common-obj-$(call land,$(CONFIG_SPICE),$(CONFIG_GIO)) += spice-app.mo
> +ifeq ($(CONFIG_GIO)$(CONFIG_SPICE),yy)
> +common-obj-$(if $(CONFIG_MODULES),m,y) += spice-app.mo
> +endif
That would not be a quick patch that Peter can apply to fix the build...
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module
2019-08-22 17:42 [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module Paolo Bonzini
2019-08-23 7:32 ` Marc-André Lureau
@ 2019-08-23 12:32 ` Miroslav Rezanina
2019-08-23 14:13 ` Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Miroslav Rezanina @ 2019-08-23 12:32 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: marcandre.lureau, qemu-devel, peter.maydell
On Thu, Aug 22, 2019 at 07:42:14PM +0200, Paolo Bonzini wrote:
> $(call land, $(CONFIG_SPICE), $(CONFIG_GIO)) will never return "m" so
> ui-spice-app is always linked into QEMU.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> tests/modules-test.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/tests/modules-test.c b/tests/modules-test.c
> index a8118e9..f9de3af 100644
> --- a/tests/modules-test.c
> +++ b/tests/modules-test.c
> @@ -53,9 +53,6 @@ int main(int argc, char *argv[])
> #ifdef CONFIG_SDL
> "ui-", "sdl",
> #endif
> -#if defined(CONFIG_SPICE) && defined(CONFIG_GIO)
> - "ui-", "spice-app",
> -#endif
> };
> int i;
>
> --
> 1.8.3.1
>
>
Making make check pass again for me.
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module
2019-08-22 17:42 [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module Paolo Bonzini
2019-08-23 7:32 ` Marc-André Lureau
2019-08-23 12:32 ` Miroslav Rezanina
@ 2019-08-23 14:13 ` Peter Maydell
2 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2019-08-23 14:13 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Marc-André Lureau, QEMU Developers
On Thu, 22 Aug 2019 at 18:42, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> $(call land, $(CONFIG_SPICE), $(CONFIG_GIO)) will never return "m" so
> ui-spice-app is always linked into QEMU.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> tests/modules-test.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/tests/modules-test.c b/tests/modules-test.c
> index a8118e9..f9de3af 100644
> --- a/tests/modules-test.c
> +++ b/tests/modules-test.c
> @@ -53,9 +53,6 @@ int main(int argc, char *argv[])
> #ifdef CONFIG_SDL
> "ui-", "sdl",
> #endif
> -#if defined(CONFIG_SPICE) && defined(CONFIG_GIO)
> - "ui-", "spice-app",
> -#endif
> };
> int i;
I've applied this to master as a build fix for the moment, thanks.
We can properly build the module and revert this bit as the
longer-term fix.
thanks
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-08-23 14:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-22 17:42 [Qemu-devel] [PATCH] modules-test: ui-spice-app is not built as module Paolo Bonzini
2019-08-23 7:32 ` Marc-André Lureau
2019-08-23 12:03 ` Paolo Bonzini
2019-08-23 12:32 ` Miroslav Rezanina
2019-08-23 14:13 ` 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).