From fa8d22f628ecc7117ddb47af6a39921dae352c74 Mon Sep 17 00:00:00 2001 From: Jared Rossi Date: Sun, 8 Mar 2026 20:35:53 -0400 Subject: [PATCH] include/hw/s390x: Move CLP definitions for easier BIOS access Move the s390-pci-clp definitions into the "ipl" sub-directory, which is visible to the s390-bios. This allows the bios to reuse the architected definitions and prevents code duplication. Reviewed-by: Thomas Huth Reviewed-by: Eric Farman Reviewed-by: Matthew Rosato Signed-off-by: Jared Rossi Message-ID: <20260309003601.242634-8-jrossi@linux.ibm.com> Signed-off-by: Thomas Huth --- MAINTAINERS | 1 + hw/s390x/s390-pci-vfio.c | 2 +- include/hw/s390x/{ => ipl}/s390-pci-clp.h | 0 include/hw/s390x/s390-pci-bus.h | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename include/hw/s390x/{ => ipl}/s390-pci-clp.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index f6d43a4143..9d1614fd7e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1882,6 +1882,7 @@ R: Eric Farman S: Supported F: hw/s390x/s390-pci* F: include/hw/s390x/s390-pci* +F: include/hw/s390x/ipl/s390-pci* F: util/s390x_pci_mmio.c L: qemu-s390x@nongnu.org diff --git a/hw/s390x/s390-pci-vfio.c b/hw/s390x/s390-pci-vfio.c index 9e31029d7a..8ce44dbecc 100644 --- a/hw/s390x/s390-pci-vfio.c +++ b/hw/s390x/s390-pci-vfio.c @@ -17,7 +17,7 @@ #include "trace.h" #include "hw/s390x/s390-pci-bus.h" -#include "hw/s390x/s390-pci-clp.h" +#include "hw/s390x/ipl/s390-pci-clp.h" #include "hw/s390x/s390-pci-vfio.h" #include "hw/vfio/pci.h" #include "hw/vfio/vfio-container-legacy.h" diff --git a/include/hw/s390x/s390-pci-clp.h b/include/hw/s390x/ipl/s390-pci-clp.h similarity index 100% rename from include/hw/s390x/s390-pci-clp.h rename to include/hw/s390x/ipl/s390-pci-clp.h diff --git a/include/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h index 04944d4fed..f643e13057 100644 --- a/include/hw/s390x/s390-pci-bus.h +++ b/include/hw/s390x/s390-pci-bus.h @@ -19,7 +19,7 @@ #include "hw/s390x/sclp.h" #include "hw/s390x/s390_flic.h" #include "hw/s390x/css.h" -#include "hw/s390x/s390-pci-clp.h" +#include "hw/s390x/ipl/s390-pci-clp.h" #include "qom/object.h" #define TYPE_S390_PCI_HOST_BRIDGE "s390-pcihost"