Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-16 23:02:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

i386: correctly select code in hw/i386 that depends on other components

Browse Source 
fw_cfg.c and vapic.c are currently included unconditionally but
depend on other components.  vapic.c depends on the local APIC,
while fw_cfg.c includes a piece of AML builder code that depends
on CONFIG_ACPI.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Message-ID: <20240509170044.190795-9-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-05-09 19:00:39 +02:00
parent 88f5ed7017
commit 7974e51342
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/i386/fw_cfg.c
View File

@ -203,6 +203,7 @@ void fw_cfg_build_feature_control(MachineState *ms, FWCfgState *fw_cfg)
fw_cfg_add_file(fw_cfg, "etc/msr_feature_control", val, sizeof(*val)); fw_cfg_add_file(fw_cfg, "etc/msr_feature_control", val, sizeof(*val));
} }
#ifdef CONFIG_ACPI
void fw_cfg_add_acpi_dsdt(Aml *scope, FWCfgState *fw_cfg) void fw_cfg_add_acpi_dsdt(Aml *scope, FWCfgState *fw_cfg)
{ {
/* /*
@ -229,3 +230,4 @@ void fw_cfg_add_acpi_dsdt(Aml *scope, FWCfgState *fw_cfg)
aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(dev, aml_name_decl("_CRS", crs));
aml_append(scope, dev); aml_append(scope, dev);
} }
#endif

2
hw/i386/meson.build
View File

@ -1,12 +1,12 @@
i386_ss = ss.source_set() i386_ss = ss.source_set()
i386_ss.add(files( i386_ss.add(files(
'fw_cfg.c', 'fw_cfg.c',
'vapic.c',
'e820_memory_layout.c', 'e820_memory_layout.c',
'multiboot.c', 'multiboot.c',
'x86.c', 'x86.c',
)) ))
i386_ss.add(when: 'CONFIG_APIC', if_true: files('vapic.c'))
i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86-iommu.c'), i386_ss.add(when: 'CONFIG_X86_IOMMU', if_true: files('x86-iommu.c'),
if_false: files('x86-iommu-stub.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_AMD_IOMMU', if_true: files('amd_iommu.c'),