[PATCH v2 31/38] hw/s390x: Include full path to target 'cpu.h' header

Philippe Mathieu-Daudé posted 38 patches 3 weeks, 4 days ago
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Peter Maydell <peter.maydell@linaro.org>, Igor Mitsyanko <i.mitsyanko@gmail.com>, Eric Auger <eric.auger@redhat.com>, Michael Rolnik <mrolnik@gmail.com>, Helge Deller <deller@gmx.de>, Paolo Bonzini <pbonzini@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Gerd Hoffmann <kraxel@redhat.com>, Laurent Vivier <laurent@vivier.eu>, Yoshinori Sato <yoshinori.sato@nifty.com>, Magnus Damm <magnus.damm@gmail.com>, Thomas Huth <th.huth+qemu@posteo.eu>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Alistair Francis <alistair@alistair23.me>, Huacai Chen <chenhuacai@kernel.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, "Hervé Poussineau" <hpoussin@reactos.org>, Aleksandar Rikalo <arikalo@gmail.com>, Aurelien Jarno <aurelien@aurel32.net>, Stafford Horne <shorne@gmail.com>, Jia Liu <proljc@gmail.com>, Bernhard Beschow <shentey@gmail.com>, BALATON Zoltan <balaton@eik.bme.hu>, Nicholas Piggin <npiggin@gmail.com>, Chinmay Rath <rathc@linux.ibm.com>, Glenn Miles <milesg@linux.ibm.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Sai Pavan Boddu <sai.pavan.boddu@amd.com>, Palmer Dabbelt <palmer@dabbelt.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Tony Krowiak <akrowiak@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Jason Herne <jjherne@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>, Jared Rossi <jrossi@linux.ibm.com>, Zhuoying Cai <zycai@linux.ibm.com>, Farhan Ali <alifm@linux.ibm.com>, "Clément Chigot" <chigot@adacore.com>, Frederic Konrad <konrad.frederic@yahoo.fr>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Bastian Koppelmann <kbastian@rumtueddeln.de>, Max Filippov <jcmvbkbc@gmail.com>, Antony Pavlov <antonynpavlov@gmail.com>, Jean-Christophe Dubois <jcd@tribudubois.net>, Andrey Smirnov <andrew.smirnov@gmail.com>, Aditya Gupta <adityag@linux.ibm.com>, Sourabh Jain <sourabhjain@linux.ibm.com>, "Dr. David Alan Gilbert" <dave@treblig.org>, David Woodhouse <dwmw2@infradead.org>, Paul Durrant <paul@xen.org>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, Alexander Graf <agraf@csgraf.de>, Brian Cain <brian.cain@oss.qualcomm.com>, Zhao Liu <zhao1.liu@intel.com>, Song Gao <gaosong@loongson.cn>
[PATCH v2 31/38] hw/s390x: Include full path to target 'cpu.h' header
Posted by Philippe Mathieu-Daudé 3 weeks, 4 days ago
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/s390x/ipl.h            | 2 +-
 hw/s390x/s390-hypercall.h | 2 +-
 hw/s390x/ap-bridge.c      | 2 +-
 hw/s390x/s390-hypercall.c | 2 +-
 hw/s390x/s390-stattrib.c  | 2 +-
 hw/s390x/tod-tcg.c        | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hw/s390x/ipl.h b/hw/s390x/ipl.h
index 403cd08450d..fac30763df2 100644
--- a/hw/s390x/ipl.h
+++ b/hw/s390x/ipl.h
@@ -13,7 +13,7 @@
 #ifndef HW_S390_IPL_H
 #define HW_S390_IPL_H
 
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 #include "exec/target_page.h"
 #include "system/address-spaces.h"
 #include "system/memory.h"
diff --git a/hw/s390x/s390-hypercall.h b/hw/s390x/s390-hypercall.h
index 4f07209128c..c5a2b17e858 100644
--- a/hw/s390x/s390-hypercall.h
+++ b/hw/s390x/s390-hypercall.h
@@ -12,7 +12,7 @@
 #ifndef HW_S390_HYPERCALL_H
 #define HW_S390_HYPERCALL_H
 
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 
 #define DIAG500_VIRTIO_NOTIFY           0 /* legacy, implemented as a NOP */
 #define DIAG500_VIRTIO_RESET            1 /* legacy */
diff --git a/hw/s390x/ap-bridge.c b/hw/s390x/ap-bridge.c
index 5cdbf098074..c7e49d966ba 100644
--- a/hw/s390x/ap-bridge.c
+++ b/hw/s390x/ap-bridge.c
@@ -14,7 +14,7 @@
 #include "qemu/bitops.h"
 #include "qemu/module.h"
 #include "hw/s390x/ap-bridge.h"
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 
 static char *ap_bus_get_dev_path(DeviceState *dev)
 {
diff --git a/hw/s390x/s390-hypercall.c b/hw/s390x/s390-hypercall.c
index 508dd97ca0d..71dc717d08a 100644
--- a/hw/s390x/s390-hypercall.c
+++ b/hw/s390x/s390-hypercall.c
@@ -11,7 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu/error-report.h"
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 #include "hw/s390x/s390-virtio-ccw.h"
 #include "hw/s390x/s390-hypercall.h"
 #include "hw/s390x/ioinst.h"
diff --git a/hw/s390x/s390-stattrib.c b/hw/s390x/s390-stattrib.c
index d808ece3b92..2e83aa211cd 100644
--- a/hw/s390x/s390-stattrib.c
+++ b/hw/s390x/s390-stattrib.c
@@ -20,7 +20,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qobject/qdict.h"
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 
 /* 512KiB cover 2GB of guest memory */
 #define CMMA_BLOCK_SIZE  (512 * KiB)
diff --git a/hw/s390x/tod-tcg.c b/hw/s390x/tod-tcg.c
index 0cc96624e1b..448b531b2ea 100644
--- a/hw/s390x/tod-tcg.c
+++ b/hw/s390x/tod-tcg.c
@@ -14,7 +14,7 @@
 #include "qemu/timer.h"
 #include "qemu/cutils.h"
 #include "qemu/module.h"
-#include "cpu.h"
+#include "target/s390x/cpu.h"
 #include "tcg/tcg_s390x.h"
 #include "system/rtc.h"
 
-- 
2.53.0


Re: [PATCH v2 31/38] hw/s390x: Include full path to target 'cpu.h' header
Posted by Pierrick Bouvier 3 weeks, 3 days ago
On 3/12/26 11:20 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/ipl.h            | 2 +-
>   hw/s390x/s390-hypercall.h | 2 +-
>   hw/s390x/ap-bridge.c      | 2 +-
>   hw/s390x/s390-hypercall.c | 2 +-
>   hw/s390x/s390-stattrib.c  | 2 +-
>   hw/s390x/tod-tcg.c        | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)
> 

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>

Re: [PATCH v2 31/38] hw/s390x: Include full path to target 'cpu.h' header
Posted by Thomas Huth 3 weeks, 4 days ago
On 13/03/2026 07.20, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
>   hw/s390x/ipl.h            | 2 +-
>   hw/s390x/s390-hypercall.h | 2 +-
>   hw/s390x/ap-bridge.c      | 2 +-
>   hw/s390x/s390-hypercall.c | 2 +-
>   hw/s390x/s390-stattrib.c  | 2 +-
>   hw/s390x/tod-tcg.c        | 2 +-
>   6 files changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Thomas Huth <thuth@redhat.com>