![Philippe Mathieu-Daudé](/assets/img/avatar_default.png)
Introduce the X86_FW_OVMF Kconfig symbol for OVMF-specific code. Move the OVMF-specific code from pc_sysfw.c to pc_sysfw_ovmf.c, adding a pair of stubs. Update MAINTAINERS to reach OVMF maintainers when these new files are modified. This fixes when building the microvm machine standalone: /usr/bin/ld: libqemu-i386-softmmu.fa.p/target_i386_monitor.c.o: in function `qmp_sev_inject_launch_secret': target/i386/monitor.c:749: undefined reference to `pc_system_ovmf_table_find' Fixes: f522cef9b35 ("sev: update sev-inject-launch-secret to make gpa optional") Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Message-Id: <20210616204328.2611406-22-philmd@redhat.com>
36 lines
1.2 KiB
Meson
36 lines
1.2 KiB
Meson
i386_ss = ss.source_set()
|
|
i386_ss.add(files(
|
|
'fw_cfg.c',
|
|
'kvmvapic.c',
|
|
'e820_memory_layout.c',
|
|
'multiboot.c',
|
|
'x86.c',
|
|
))
|
|
|
|
i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86-iommu.c'),
|
|
if_false: files('x86-iommu-stub.c'))
|
|
i386_ss.add(when: 'CONFIG_AMD_IOMMU', if_true: files('amd_iommu.c'))
|
|
i386_ss.add(when: 'CONFIG_I440FX', if_true: files('pc_piix.c'))
|
|
i386_ss.add(when: 'CONFIG_MICROVM', if_true: files('microvm.c', 'acpi-microvm.c'))
|
|
i386_ss.add(when: 'CONFIG_Q35', if_true: files('pc_q35.c'))
|
|
i386_ss.add(when: 'CONFIG_VMMOUSE', if_true: files('vmmouse.c'))
|
|
i386_ss.add(when: 'CONFIG_VMPORT', if_true: files('vmport.c'))
|
|
i386_ss.add(when: 'CONFIG_VTD', if_true: files('intel_iommu.c'))
|
|
|
|
i386_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi-common.c'))
|
|
i386_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device_x86.c'))
|
|
i386_ss.add(when: 'CONFIG_PC', if_true: files(
|
|
'pc.c',
|
|
'pc_sysfw.c',
|
|
'acpi-build.c',
|
|
'port92.c'))
|
|
i386_ss.add(when: 'CONFIG_X86_FW_OVMF', if_true: files('pc_sysfw_ovmf.c'),
|
|
if_false: files('pc_sysfw_ovmf-stubs.c'))
|
|
|
|
subdir('kvm')
|
|
subdir('xen')
|
|
|
|
i386_ss.add_all(xenpv_ss)
|
|
|
|
hw_arch += {'i386': i386_ss}
|