* [Qemu-devel] [PATCH v2 0/6] hw/acpi: Improve build modularity (targeting MIPS/PPC)
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Corey Minyard, Michael S. Tsirkin, Aleksandar Rikalo,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Philippe Mathieu-Daudé,
Aurelien Jarno
Hi,
This series is not related to the previous one I just send:
hw/i386/acpi: Improve build modularity (isapc/q35/...)
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04678.html
While the first only concern X86 (changes within the architecture),
this one allow the core ACPI feature to be used by the MIPS and
PPC archs (specific series will follow).
v2:
- Fixed IPMI build error (patchew)
- Added possibility to build without ACPI (X86)
v1: https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg04696.html
Regards,
Phil.
Philippe Mathieu-Daudé (6):
hw/acpi: Move the IPMI stub to the stubs/ directory
hw/acpi: Move the ACPI stub to the stubs/ directory
hw/acpi: Simplify the Makefile logic
hw/acpi: Always build the 'core' ACPI functions
stubs: Add missing ACPI symbols
vl: Do not set acpi_enabled when ACPI is disabled at build time
MAINTAINERS | 2 ++
hw/acpi/Makefile.objs | 22 +++++++---------------
hw/acpi/core.c | 1 +
stubs/Makefile.objs | 2 ++
hw/acpi/acpi-stub.c => stubs/acpi.c | 6 ++++++
hw/acpi/ipmi-stub.c => stubs/ipmi.c | 0
vl.c | 1 -
7 files changed, 18 insertions(+), 16 deletions(-)
rename hw/acpi/acpi-stub.c => stubs/acpi.c (93%)
rename hw/acpi/ipmi-stub.c => stubs/ipmi.c (100%)
--
2.20.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 1/6] hw/acpi: Move the IPMI stub to the stubs/ directory
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Markovic, Aleksandar Rikalo, Michael S. Tsirkin,
Aurelien Jarno, Paolo Bonzini, Igor Mammedov, Corey Minyard,
Philippe Mathieu-Daudé
Move the IPMI stub file to the stubs/ directory to simplify the
hw/acpi Makefile.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 1/6] hw/acpi: Move the IPMI stub to the stubs/ directory
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Corey Minyard, Michael S. Tsirkin, Aleksandar Rikalo,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Philippe Mathieu-Daudé,
Aurelien Jarno
Move the IPMI stub file to the stubs/ directory to simplify the
hw/acpi Makefile.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
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
^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/6] hw/acpi: Move the IPMI stub to the stubs/ directory
@ 2019-05-02 13:24 ` Corey Minyard
0 siblings, 0 replies; 18+ messages in thread
From: Corey Minyard @ 2019-05-02 13:24 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: qemu-devel, Aleksandar Markovic, Aleksandar Rikalo,
Michael S. Tsirkin, Aurelien Jarno, Paolo Bonzini, Igor Mammedov
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é <philmd@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.
Acked-by: Corey Minyard <cminyard@mvista.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/6] hw/acpi: Move the IPMI stub to the stubs/ directory
@ 2019-05-02 13:24 ` Corey Minyard
0 siblings, 0 replies; 18+ messages in thread
From: Corey Minyard @ 2019-05-02 13:24 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Michael S. Tsirkin, Aleksandar Rikalo, qemu-devel,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Aurelien Jarno
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é <philmd@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.
Acked-by: Corey Minyard <cminyard@mvista.com>
> ---
> 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
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/6] hw/acpi: Move the IPMI stub to the stubs/ directory
@ 2019-05-02 16:28 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-02 16:28 UTC (permalink / raw)
To: minyard
Cc: qemu-devel, Aleksandar Markovic, Aleksandar Rikalo,
Michael S. Tsirkin, Aurelien Jarno, Paolo Bonzini, Igor Mammedov
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é <philmd@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 <cminyard@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
>>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [Qemu-devel] [PATCH v2 1/6] hw/acpi: Move the IPMI stub to the stubs/ directory
@ 2019-05-02 16:28 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-02 16:28 UTC (permalink / raw)
To: minyard
Cc: Michael S. Tsirkin, Aleksandar Rikalo, qemu-devel,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Aurelien Jarno
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é <philmd@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 <cminyard@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
>>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 2/6] hw/acpi: Move the ACPI stub to the stubs/ directory
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Markovic, Aleksandar Rikalo, Michael S. Tsirkin,
Aurelien Jarno, Paolo Bonzini, Igor Mammedov, Corey Minyard,
Philippe Mathieu-Daudé
Move the ACPI stub file to the stubs/ directory to greatly simplify
the hw/acpi Makefile.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 1 +
hw/acpi/Makefile.objs | 5 -----
stubs/Makefile.objs | 1 +
hw/acpi/acpi-stub.c => stubs/acpi.c | 0
4 files changed, 2 insertions(+), 5 deletions(-)
rename hw/acpi/acpi-stub.c => stubs/acpi.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e1681eca5cb..d05a3d36511 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1357,6 +1357,7 @@ F: hw/acpi/*
F: hw/smbios/*
F: hw/i386/acpi-build.[hc]
F: hw/arm/virt-acpi-build.c
+F: stubs/acpi.c
F: tests/bios-tables-test.c
F: tests/acpi-utils.[hc]
F: tests/data/acpi/
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 4e302feb885..73eca4f7dff 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -6,15 +6,10 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
-common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
common-obj-y += acpi_interface.o
common-obj-y += bios-linker-loader.o
common-obj-y += aml-build.o
common-obj-$(CONFIG_TPM) += tpm.o
-
common-obj-$(CONFIG_IPMI) += ipmi.o
-else
-common-obj-y += acpi-stub.o
endif
-common-obj-$(CONFIG_ALL) += acpi-stub.o
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 36bb9ff0b1d..47ee66a71f2 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -1,3 +1,4 @@
+stub-obj-y += acpi.o
stub-obj-y += bdrv-next-monitor-owned.o
stub-obj-y += blk-commit-all.o
stub-obj-y += blockdev-close-all-bdrv-states.o
diff --git a/hw/acpi/acpi-stub.c b/stubs/acpi.c
similarity index 100%
rename from hw/acpi/acpi-stub.c
rename to stubs/acpi.c
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 2/6] hw/acpi: Move the ACPI stub to the stubs/ directory
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Corey Minyard, Michael S. Tsirkin, Aleksandar Rikalo,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Philippe Mathieu-Daudé,
Aurelien Jarno
Move the ACPI stub file to the stubs/ directory to greatly simplify
the hw/acpi Makefile.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
MAINTAINERS | 1 +
hw/acpi/Makefile.objs | 5 -----
stubs/Makefile.objs | 1 +
hw/acpi/acpi-stub.c => stubs/acpi.c | 0
4 files changed, 2 insertions(+), 5 deletions(-)
rename hw/acpi/acpi-stub.c => stubs/acpi.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index e1681eca5cb..d05a3d36511 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1357,6 +1357,7 @@ F: hw/acpi/*
F: hw/smbios/*
F: hw/i386/acpi-build.[hc]
F: hw/arm/virt-acpi-build.c
+F: stubs/acpi.c
F: tests/bios-tables-test.c
F: tests/acpi-utils.[hc]
F: tests/data/acpi/
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 4e302feb885..73eca4f7dff 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -6,15 +6,10 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
-common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
common-obj-y += acpi_interface.o
common-obj-y += bios-linker-loader.o
common-obj-y += aml-build.o
common-obj-$(CONFIG_TPM) += tpm.o
-
common-obj-$(CONFIG_IPMI) += ipmi.o
-else
-common-obj-y += acpi-stub.o
endif
-common-obj-$(CONFIG_ALL) += acpi-stub.o
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 36bb9ff0b1d..47ee66a71f2 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -1,3 +1,4 @@
+stub-obj-y += acpi.o
stub-obj-y += bdrv-next-monitor-owned.o
stub-obj-y += blk-commit-all.o
stub-obj-y += blockdev-close-all-bdrv-states.o
diff --git a/hw/acpi/acpi-stub.c b/stubs/acpi.c
similarity index 100%
rename from hw/acpi/acpi-stub.c
rename to stubs/acpi.c
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 3/6] hw/acpi: Simplify the Makefile logic
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Markovic, Aleksandar Rikalo, Michael S. Tsirkin,
Aurelien Jarno, Paolo Bonzini, Igor Mammedov, Corey Minyard,
Philippe Mathieu-Daudé
Simplify the Makefile logic to ease further modifications/reviews.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/Makefile.objs | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 73eca4f7dff..b5515c626a6 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -1,4 +1,3 @@
-ifeq ($(CONFIG_ACPI),y)
common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
@@ -6,10 +5,8 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
-
-common-obj-y += acpi_interface.o
-common-obj-y += bios-linker-loader.o
-common-obj-y += aml-build.o
-common-obj-$(CONFIG_TPM) += tpm.o
-common-obj-$(CONFIG_IPMI) += ipmi.o
-endif
+common-obj-$(CONFIG_ACPI) += acpi_interface.o
+common-obj-$(CONFIG_ACPI) += bios-linker-loader.o
+common-obj-$(CONFIG_ACPI) += aml-build.o
+common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_TPM)) += tpm.o
+common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 3/6] hw/acpi: Simplify the Makefile logic
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Corey Minyard, Michael S. Tsirkin, Aleksandar Rikalo,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Philippe Mathieu-Daudé,
Aurelien Jarno
Simplify the Makefile logic to ease further modifications/reviews.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/Makefile.objs | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 73eca4f7dff..b5515c626a6 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -1,4 +1,3 @@
-ifeq ($(CONFIG_ACPI),y)
common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
@@ -6,10 +5,8 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
-
-common-obj-y += acpi_interface.o
-common-obj-y += bios-linker-loader.o
-common-obj-y += aml-build.o
-common-obj-$(CONFIG_TPM) += tpm.o
-common-obj-$(CONFIG_IPMI) += ipmi.o
-endif
+common-obj-$(CONFIG_ACPI) += acpi_interface.o
+common-obj-$(CONFIG_ACPI) += bios-linker-loader.o
+common-obj-$(CONFIG_ACPI) += aml-build.o
+common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_TPM)) += tpm.o
+common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 4/6] hw/acpi: Always build the 'core' ACPI functions
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Markovic, Aleksandar Rikalo, Michael S. Tsirkin,
Aurelien Jarno, Paolo Bonzini, Igor Mammedov, Corey Minyard,
Philippe Mathieu-Daudé
The 'core' ACPI functions are not X86-specific.
Let this file be built unconditionally, this will allow
us to use ACPI on non-X86 architectures.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/Makefile.objs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index b5515c626a6..0427253816b 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -1,4 +1,5 @@
-common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
+common-obj-$(CONFIG_ACPI) += core.o
+common-obj-$(CONFIG_ACPI_X86) += piix4.o pcihp.o
common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 4/6] hw/acpi: Always build the 'core' ACPI functions
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Corey Minyard, Michael S. Tsirkin, Aleksandar Rikalo,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Philippe Mathieu-Daudé,
Aurelien Jarno
The 'core' ACPI functions are not X86-specific.
Let this file be built unconditionally, this will allow
us to use ACPI on non-X86 architectures.
Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/Makefile.objs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index b5515c626a6..0427253816b 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -1,4 +1,5 @@
-common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
+common-obj-$(CONFIG_ACPI) += core.o
+common-obj-$(CONFIG_ACPI_X86) += piix4.o pcihp.o
common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 5/6] stubs: Add missing ACPI symbols
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Markovic, Aleksandar Rikalo, Michael S. Tsirkin,
Aurelien Jarno, Paolo Bonzini, Igor Mammedov, Corey Minyard,
Philippe Mathieu-Daudé
When building with ACPI disabled, we get:
/usr/bin/ld: hw/i386/pc.o: in function `bochs_bios_init':
/source/qemu/hw/i386/pc.c:1017: undefined reference to `acpi_tables_len'
/usr/bin/ld: /source/qemu/hw/i386/pc.c:1017: undefined reference to `acpi_tables'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:204: qemu-system-x86_64] Error 1
These symbols are indeed declared as extern in "hw/acpi/acpi.h".
Add them as stub to satisfy the linker.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
stubs/acpi.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/stubs/acpi.c b/stubs/acpi.c
index 4c9d081ed48..cd0119f9fb1 100644
--- a/stubs/acpi.c
+++ b/stubs/acpi.c
@@ -23,6 +23,10 @@
#include "qapi/qmp/qerror.h"
#include "hw/acpi/acpi.h"
+size_t acpi_tables_len;
+
+char unsigned *acpi_tables;
+
void acpi_table_add(const QemuOpts *opts, Error **errp)
{
error_setg(errp, QERR_UNSUPPORTED);
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Qemu-devel] [PATCH v2 5/6] stubs: Add missing ACPI symbols
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Corey Minyard, Michael S. Tsirkin, Aleksandar Rikalo,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Philippe Mathieu-Daudé,
Aurelien Jarno
When building with ACPI disabled, we get:
/usr/bin/ld: hw/i386/pc.o: in function `bochs_bios_init':
/source/qemu/hw/i386/pc.c:1017: undefined reference to `acpi_tables_len'
/usr/bin/ld: /source/qemu/hw/i386/pc.c:1017: undefined reference to `acpi_tables'
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:204: qemu-system-x86_64] Error 1
These symbols are indeed declared as extern in "hw/acpi/acpi.h".
Add them as stub to satisfy the linker.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
stubs/acpi.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/stubs/acpi.c b/stubs/acpi.c
index 4c9d081ed48..cd0119f9fb1 100644
--- a/stubs/acpi.c
+++ b/stubs/acpi.c
@@ -23,6 +23,10 @@
#include "qapi/qmp/qerror.h"
#include "hw/acpi/acpi.h"
+size_t acpi_tables_len;
+
+char unsigned *acpi_tables;
+
void acpi_table_add(const QemuOpts *opts, Error **errp)
{
error_setg(errp, QERR_UNSUPPORTED);
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [Qemu-devel] [PATCH v2 6/6] vl: Do not set acpi_enabled when ACPI is disabled at build time
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Aleksandar Markovic, Aleksandar Rikalo, Michael S. Tsirkin,
Aurelien Jarno, Paolo Bonzini, Igor Mammedov, Corey Minyard,
Philippe Mathieu-Daudé
When building with CONFIG_ACPI disabled, the 'acpi_enabled' is
still initialized to '1' (enabled).
Remove the confusion by moving the variable to hw/core/acpi.c,
and adding a similar stub.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/core.c | 1 +
stubs/acpi.c | 2 ++
vl.c | 1 -
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 9ed1629f367..b2730aec8a0 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -59,6 +59,7 @@ static const char unsigned dfl_hdr[ACPI_TABLE_HDR_SIZE - ACPI_TABLE_PFX_SIZE] =
"QEMU\1\0\0\0" /* ASL compiler ID (4), version (4) */
;
+int acpi_enabled = 1;
char unsigned *acpi_tables;
size_t acpi_tables_len;
diff --git a/stubs/acpi.c b/stubs/acpi.c
index cd0119f9fb1..f1ef6b8e795 100644
--- a/stubs/acpi.c
+++ b/stubs/acpi.c
@@ -23,6 +23,8 @@
#include "qapi/qmp/qerror.h"
#include "hw/acpi/acpi.h"
+int acpi_enabled;
+
size_t acpi_tables_len;
char unsigned *acpi_tables;
diff --git a/vl.c b/vl.c
index ff5dfb6fbc3..c9364b4ec10 100644
--- a/vl.c
+++ b/vl.c
@@ -166,7 +166,6 @@ int smp_cpus;
unsigned int max_cpus;
int smp_cores = 1;
int smp_threads = 1;
-int acpi_enabled = 1;
int no_hpet = 0;
int fd_bootchk = 1;
static int no_reboot;
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread* [Qemu-devel] [PATCH v2 6/6] vl: Do not set acpi_enabled when ACPI is disabled at build time
@ 2019-04-28 6:47 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 18+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-28 6:47 UTC (permalink / raw)
To: qemu-devel
Cc: Corey Minyard, Michael S. Tsirkin, Aleksandar Rikalo,
Aleksandar Markovic, Igor Mammedov, Paolo Bonzini,
Philippe Mathieu-Daudé,
Aurelien Jarno
When building with CONFIG_ACPI disabled, the 'acpi_enabled' is
still initialized to '1' (enabled).
Remove the confusion by moving the variable to hw/core/acpi.c,
and adding a similar stub.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/acpi/core.c | 1 +
stubs/acpi.c | 2 ++
vl.c | 1 -
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 9ed1629f367..b2730aec8a0 100644
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -59,6 +59,7 @@ static const char unsigned dfl_hdr[ACPI_TABLE_HDR_SIZE - ACPI_TABLE_PFX_SIZE] =
"QEMU\1\0\0\0" /* ASL compiler ID (4), version (4) */
;
+int acpi_enabled = 1;
char unsigned *acpi_tables;
size_t acpi_tables_len;
diff --git a/stubs/acpi.c b/stubs/acpi.c
index cd0119f9fb1..f1ef6b8e795 100644
--- a/stubs/acpi.c
+++ b/stubs/acpi.c
@@ -23,6 +23,8 @@
#include "qapi/qmp/qerror.h"
#include "hw/acpi/acpi.h"
+int acpi_enabled;
+
size_t acpi_tables_len;
char unsigned *acpi_tables;
diff --git a/vl.c b/vl.c
index ff5dfb6fbc3..c9364b4ec10 100644
--- a/vl.c
+++ b/vl.c
@@ -166,7 +166,6 @@ int smp_cpus;
unsigned int max_cpus;
int smp_cores = 1;
int smp_threads = 1;
-int acpi_enabled = 1;
int no_hpet = 0;
int fd_bootchk = 1;
static int no_reboot;
--
2.20.1
^ permalink raw reply related [flat|nested] 18+ messages in thread