 9e7118023f
			
		
	
	
		9e7118023f
		
	
	
	
	
		
			
			Add a Kconfig entry for guest-loader so we can optionally deselect
it (default is built in), and add a Meson dependency on libfdt.
This fixes when building with --disable-fdt:
  /usr/bin/ld: libcommon.fa.p/hw_core_guest-loader.c.o: in function `loader_insert_platform_data':
  hw/core/guest-loader.c:56: undefined reference to `qemu_fdt_add_subnode'
  /usr/bin/ld: hw/core/guest-loader.c:57: undefined reference to `qemu_fdt_setprop'
  /usr/bin/ld: hw/core/guest-loader.c:61: undefined reference to `qemu_fdt_setprop_string_array'
  /usr/bin/ld: hw/core/guest-loader.c:68: undefined reference to `qemu_fdt_setprop_string'
  /usr/bin/ld: hw/core/guest-loader.c:74: undefined reference to `qemu_fdt_setprop_string_array'
  collect2: error: ld returned 1 exit status
Fixes: a33ff6d2c6b ("hw/core: implement a guest-loader to support static hypervisor guests")
Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20210315170439.2868903-1-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
		
	
			
		
			
				
	
	
		
			45 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Meson
		
	
	
	
	
	
			
		
		
	
	
			45 lines
		
	
	
		
			1.3 KiB
		
	
	
	
		
			Meson
		
	
	
	
	
	
| # core qdev-related obj files, also used by *-user and unit tests
 | |
| hwcore_files = files(
 | |
|   'bus.c',
 | |
|   'hotplug.c',
 | |
|   'qdev-properties.c',
 | |
|   'qdev.c',
 | |
|   'reset.c',
 | |
|   'resettable.c',
 | |
|   'vmstate-if.c',
 | |
|   # irq.c needed for qdev GPIO handling:
 | |
|   'irq.c',
 | |
|   'clock.c',
 | |
|   'qdev-clock.c',
 | |
| )
 | |
| 
 | |
| 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'))
 | |
| common_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
 | |
| common_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
 | |
| common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
 | |
| 
 | |
| softmmu_ss.add(files(
 | |
|   'fw-path-provider.c',
 | |
|   'loader.c',
 | |
|   'machine-hmp-cmds.c',
 | |
|   'machine.c',
 | |
|   'nmi.c',
 | |
|   'null-machine.c',
 | |
|   'qdev-fw.c',
 | |
|   'qdev-properties-system.c',
 | |
|   'sysbus.c',
 | |
|   'vm-change-state-handler.c',
 | |
|   'clock-vmstate.c',
 | |
| ))
 | |
| 
 | |
| specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: files(
 | |
|   'machine-qmp-cmds.c',
 | |
|   'numa.c',
 | |
| ))
 |