 86ce2d28fa
			
		
	
	
		86ce2d28fa
		
	
	
	
	
		
			
			We are going to introduce an unit test for the parser smp_parse() in hw/core/machine.c, but now machine.c is only built in softmmu. In order to solve the build dependency on the smp parsing code and avoid building unrelated stuff for the unit tests, move the tested code from machine.c into a separate file, i.e., machine-smp.c and build it in common field. Signed-off-by: Yanan Wang <wangyanan55@huawei.com> Reviewed-by: Andrew Jones <drjones@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20211026034659.22040-2-wangyanan55@huawei.com> Acked-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
		
			
				
	
	
		
			57 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Meson
		
	
	
	
	
	
			
		
		
	
	
			57 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			Meson
		
	
	
	
	
	
| # core qdev-related obj files, also used by *-user and unit tests
 | |
| hwcore_ss.add(files(
 | |
|   'bus.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',
 | |
| ))
 | |
| if have_system
 | |
|   hwcore_ss.add(files(
 | |
|     'hotplug.c',
 | |
|     'qdev-hotplug.c',
 | |
|   ))
 | |
| else
 | |
|   hwcore_ss.add(files(
 | |
|     'hotplug-stubs.c',
 | |
|   ))
 | |
| endif
 | |
| 
 | |
| common_ss.add(files('cpu-common.c'))
 | |
| common_ss.add(files('machine-smp.c'))
 | |
| softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))
 | |
| softmmu_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c'))
 | |
| softmmu_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c'))
 | |
| softmmu_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c'))
 | |
| softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c'))
 | |
| softmmu_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c'))
 | |
| softmmu_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c'))
 | |
| softmmu_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c'))
 | |
| softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c'))
 | |
| 
 | |
| softmmu_ss.add(files(
 | |
|   'cpu-sysemu.c',
 | |
|   'fw-path-provider.c',
 | |
|   'gpio.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',
 | |
| ))
 |