| Message ID | 20210316202347.415131-1-anthoine.bourgeois@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/core: fix link error with --disable-fdt | expand |
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.
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',
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(-)