Message ID | 20210616204328.2611406-21-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | target/i386/sev: Housekeeping (OVMF + SEV-disabled binaries) | expand |
On Wed, Jun 16, 2021 at 10:43:25PM +0200, Philippe Mathieu-Daudé wrote: > ACPI core routines (in core.c) are not really x86-specific. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > hw/acpi/meson.build | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build > index dd69577212a..c23c67f4283 100644 > --- a/hw/acpi/meson.build > +++ b/hw/acpi/meson.build > @@ -3,6 +3,7 @@ > 'acpi_interface.c', > 'aml-build.c', > 'bios-linker-loader.c', > + 'core.c', > 'utils.c', > )) > acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c')) > @@ -14,7 +15,7 @@ > acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c')) > acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) > acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c')) > -acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c', 'pcihp.c'), if_false: files('acpi-stub.c')) > +acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('piix4.c', 'pcihp.c')) So is acpi-stub.c still useful then? > acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c')) > acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c')) > acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c')) > -- > 2.31.1
On 6/17/21 10:40 PM, Michael S. Tsirkin wrote: > On Wed, Jun 16, 2021 at 10:43:25PM +0200, Philippe Mathieu-Daudé wrote: >> ACPI core routines (in core.c) are not really x86-specific. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> hw/acpi/meson.build | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build >> index dd69577212a..c23c67f4283 100644 >> --- a/hw/acpi/meson.build >> +++ b/hw/acpi/meson.build >> @@ -3,6 +3,7 @@ >> 'acpi_interface.c', >> 'aml-build.c', >> 'bios-linker-loader.c', >> + 'core.c', >> 'utils.c', >> )) >> acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c')) >> @@ -14,7 +15,7 @@ >> acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c')) >> acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) >> acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c')) >> -acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c', 'pcihp.c'), if_false: files('acpi-stub.c')) >> +acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('piix4.c', 'pcihp.c')) > > > So is acpi-stub.c still useful then? Certainly: softmmu/vl.c:3256: acpi_table_add(opts, &error_fatal); Could be eventually merged with aml-build-stub.c...
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index dd69577212a..c23c67f4283 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -3,6 +3,7 @@ 'acpi_interface.c', 'aml-build.c', 'bios-linker-loader.c', + 'core.c', 'utils.c', )) acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c')) @@ -14,7 +15,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c')) acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c')) acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c')) -acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c', 'pcihp.c'), if_false: files('acpi-stub.c')) +acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('piix4.c', 'pcihp.c')) acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c')) acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c')) acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
ACPI core routines (in core.c) are not really x86-specific. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- hw/acpi/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)