Hi Corey, On 5/2/19 3:24 PM, Corey Minyard wrote: > On Sun, Apr 28, 2019 at 08:47:26AM +0200, Philippe Mathieu-Daudé wrote: >> Move the IPMI stub file to the stubs/ directory to simplify the >> hw/acpi Makefile. >> >> Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > > I'm not sure of the overall view of this, but this is ok from an > IPMI point of view in my view.
IIRC I had linking failure when building with Kconfig +ACPI -IPMI on MIPS/PPC (series will come on top of this one). I'll verify, I only looked at MIPS but it seems UEFI firmwares also use it on PPC and ARM (currently the ACPI table is only built on X86). Also I'll might rename stubs/ipmi.c -> stubs/acpi-ipmi.c. > > Acked-by: Corey Minyard <cminy...@mvista.com> Thanks for the review! > >> --- >> MAINTAINERS | 1 + >> hw/acpi/Makefile.objs | 3 +-- >> stubs/Makefile.objs | 1 + >> hw/acpi/ipmi-stub.c => stubs/ipmi.c | 0 >> 4 files changed, 3 insertions(+), 2 deletions(-) >> rename hw/acpi/ipmi-stub.c => stubs/ipmi.c (100%) >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index 23db6f8408a..e1681eca5cb 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1309,6 +1309,7 @@ S: Maintained >> F: include/hw/ipmi/* >> F: hw/ipmi/* >> F: hw/smbios/smbios_type_38.c >> +F: stubs/ipmi.c >> F: tests/ipmi* >> T: git https://github.com/cminyard/qemu.git master-ipmi-rebase >> >> diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs >> index 2d46e3789ae..4e302feb885 100644 >> --- a/hw/acpi/Makefile.objs >> +++ b/hw/acpi/Makefile.objs >> @@ -14,8 +14,7 @@ common-obj-y += aml-build.o >> common-obj-$(CONFIG_TPM) += tpm.o >> >> common-obj-$(CONFIG_IPMI) += ipmi.o >> -common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o >> else >> common-obj-y += acpi-stub.o >> endif >> -common-obj-$(CONFIG_ALL) += acpi-stub.o ipmi-stub.o >> +common-obj-$(CONFIG_ALL) += acpi-stub.o >> diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs >> index 269dfa58326..36bb9ff0b1d 100644 >> --- a/stubs/Makefile.objs >> +++ b/stubs/Makefile.objs >> @@ -9,6 +9,7 @@ stub-obj-y += error-printf.o >> stub-obj-y += fdset.o >> stub-obj-y += gdbstub.o >> stub-obj-y += get-vm-name.o >> +stub-obj-y += ipmi.o >> stub-obj-y += iothread.o >> stub-obj-y += iothread-lock.o >> stub-obj-y += is-daemonized.o >> diff --git a/hw/acpi/ipmi-stub.c b/stubs/ipmi.c >> similarity index 100% >> rename from hw/acpi/ipmi-stub.c >> rename to stubs/ipmi.c >> -- >> 2.20.1 >>
