qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] hw/core: fix link error with --disable-fdt
@ 2021-03-16 20:23 Anthoine Bourgeois
  2021-03-16 20:37 ` Philippe Mathieu-Daudé
  0 siblings, 1 reply; 2+ messages in thread
From: Anthoine Bourgeois @ 2021-03-16 20:23 UTC (permalink / raw)
  To: qemu-devel; +Cc: Alex Bennée

The link error appends only with x86_64-softmmu as the only target.

Fixes: a33ff6d2c6bd480fbab3bc9f748655a9269881eb ("hw/core: implement a
guest-loader to support static hypervisor guests")

Signed-off-by: Anthoine Bourgeois <anthoine.bourgeois@gmail.com>
---
 hw/core/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/core/meson.build b/hw/core/meson.build
index 9cd72edf51..5e61347779 100644
--- a/hw/core/meson.build
+++ b/hw/core/meson.build
@@ -37,7 +37,7 @@ softmmu_ss.add(files(
   'clock-vmstate.c',
 ))
 
-softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('guest-loader.c'))
+softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_FDT'], if_true: files('guest-loader.c'))
 
 specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
   'machine-qmp-cmds.c',
-- 
2.27.0



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] hw/core: fix link error with --disable-fdt
  2021-03-16 20:23 [PATCH] hw/core: fix link error with --disable-fdt Anthoine Bourgeois
@ 2021-03-16 20:37 ` Philippe Mathieu-Daudé
  0 siblings, 0 replies; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-03-16 20:37 UTC (permalink / raw)
  To: Anthoine Bourgeois, qemu-devel; +Cc: Alex Bennée

Hi Anthoine,

On 3/16/21 9:23 PM, Anthoine Bourgeois wrote:
> The link error appends only with x86_64-softmmu as the only target.
> 
> Fixes: a33ff6d2c6bd480fbab3bc9f748655a9269881eb ("hw/core: implement a
> guest-loader to support static hypervisor guests")
> 
> Signed-off-by: Anthoine Bourgeois <anthoine.bourgeois@gmail.com>
> ---
>  hw/core/meson.build | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/core/meson.build b/hw/core/meson.build
> index 9cd72edf51..5e61347779 100644
> --- a/hw/core/meson.build
> +++ b/hw/core/meson.build
> @@ -37,7 +37,7 @@ softmmu_ss.add(files(
>    'clock-vmstate.c',
>  ))
>  
> -softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('guest-loader.c'))
> +softmmu_ss.add(when: ['CONFIG_TCG', 'CONFIG_FDT'], if_true: files('guest-loader.c'))
>  
>  specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
>    'machine-qmp-cmds.c',

I suggested this change first, but then figured it would be better to
declare a Kconfig entry for guest-loader:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg791755.html

Do you mind reviewing or testing it?

Thanks,

Phil.



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-03-16 20:38 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-16 20:23 [PATCH] hw/core: fix link error with --disable-fdt Anthoine Bourgeois
2021-03-16 20:37 ` Philippe Mathieu-Daudé

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).