On 3/15/21 5:59 PM, Christian Borntraeger wrote: > On 15.03.21 17:51, Philippe Mathieu-Daudé wrote: > >> diff --git a/hw/core/Kconfig b/hw/core/Kconfig >> index fdf03514d7d..9397503656d 100644 >> --- a/hw/core/Kconfig >> +++ b/hw/core/Kconfig >> @@ -11,6 +11,11 @@ config GENERIC_LOADER >> bool >> default y >> >> +config GUEST_LOADER >> + bool >> + default y >> + depends on TCG >> + >> config OR_IRQ >> bool >> >> diff --git a/hw/core/meson.build b/hw/core/meson.build >> index 9cd72edf513..59f1605bb07 100644 >> --- a/hw/core/meson.build >> +++ b/hw/core/meson.build >> @@ -16,6 +16,7 @@ >> common_ss.add(files('cpu.c')) >> common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) >> common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: >> files('generic-loader.c')) >> +common_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: >> files('guest-loader.c')) >> common_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) >> common_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: >> files('platform-bus.c')) >> common_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) >> @@ -37,8 +38,6 @@ >> 'clock-vmstate.c', >> )) >> >> -softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('guest-loader.c')) >> - >> specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files( >> 'machine-qmp-cmds.c', >> 'numa.c', > > > Also > Tested-by: Christian Borntraeger <borntrae...@de.ibm.com>
Thanks Christian!