| From 73fb2438518ef2073f2486fcf1dd8cddffb29228 Mon Sep 17 00:00:00 2001 |
| From: Cornelia Huck <cohuck@redhat.com> |
| Date: Tue, 19 Jan 2021 12:50:41 -0500 |
| Subject: [PATCH 2/7] s390x/pci: Move header files to include/hw/s390x |
| |
| RH-Author: Cornelia Huck <cohuck@redhat.com> |
| Message-id: <20210119125046.472811-3-cohuck@redhat.com> |
| Patchwork-id: 100676 |
| O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 2/7] s390x/pci: Move header files to include/hw/s390x |
| Bugzilla: 1905391 |
| RH-Acked-by: David Hildenbrand <david@redhat.com> |
| RH-Acked-by: Auger Eric <eric.auger@redhat.com> |
| RH-Acked-by: Thomas Huth <thuth@redhat.com> |
| |
| From: Matthew Rosato <mjrosato@linux.ibm.com> |
| |
| Seems a more appropriate location for them. |
| |
| Signed-off-by: Matthew Rosato <mjrosato@linux.ibm.com> |
| Reviewed-by: Cornelia Huck <cohuck@redhat.com> |
| Signed-off-by: Alex Williamson <alex.williamson@redhat.com> |
| (cherry picked from commit 408b55db8be3e3edae041d46ef8786fabc1476aa) |
| Signed-off-by: Cornelia Huck <cohuck@redhat.com> |
| |
| Conflicts: |
| hw/s390x/s390-virtio-ccw.c |
| --> context diff |
| |
| Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com> |
| |
| MAINTAINERS | 1 + |
| hw/s390x/s390-pci-bus.c | 4 ++-- |
| hw/s390x/s390-pci-inst.c | 4 ++-- |
| hw/s390x/s390-virtio-ccw.c | 2 +- |
| {hw => include/hw}/s390x/s390-pci-bus.h | 0 |
| {hw => include/hw}/s390x/s390-pci-inst.h | 0 |
| 6 files changed, 6 insertions(+), 5 deletions(-) |
| rename {hw => include/hw}/s390x/s390-pci-bus.h (100%) |
| rename {hw => include/hw}/s390x/s390-pci-inst.h (100%) |
| |
| diff --git a/MAINTAINERS b/MAINTAINERS |
| index 2742c955754..56ca8193d86 100644 |
| |
| |
| @@ -1225,6 +1225,7 @@ S390 PCI |
| M: Matthew Rosato <mjrosato@linux.ibm.com> |
| S: Supported |
| F: hw/s390x/s390-pci* |
| +F: include/hw/s390x/s390-pci* |
| L: qemu-s390x@nongnu.org |
| |
| UniCore32 Machines |
| diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c |
| index 2d2f4a7c419..6daef2b6d57 100644 |
| |
| |
| @@ -15,8 +15,8 @@ |
| #include "qapi/error.h" |
| #include "qapi/visitor.h" |
| #include "cpu.h" |
| -#include "s390-pci-bus.h" |
| -#include "s390-pci-inst.h" |
| +#include "hw/s390x/s390-pci-bus.h" |
| +#include "hw/s390x/s390-pci-inst.h" |
| #include "hw/pci/pci_bus.h" |
| #include "hw/qdev-properties.h" |
| #include "hw/pci/pci_bridge.h" |
| diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c |
| index 27b189e6d75..b1885344f18 100644 |
| |
| |
| @@ -13,12 +13,12 @@ |
| |
| #include "qemu/osdep.h" |
| #include "cpu.h" |
| -#include "s390-pci-inst.h" |
| -#include "s390-pci-bus.h" |
| #include "exec/memop.h" |
| #include "exec/memory-internal.h" |
| #include "qemu/error-report.h" |
| #include "sysemu/hw_accel.h" |
| +#include "hw/s390x/s390-pci-inst.h" |
| +#include "hw/s390x/s390-pci-bus.h" |
| #include "hw/s390x/tod.h" |
| |
| #ifndef DEBUG_S390PCI_INST |
| diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c |
| index 5b3d07f55c4..101f3b7c6e1 100644 |
| |
| |
| @@ -27,7 +27,7 @@ |
| #include "qemu/ctype.h" |
| #include "qemu/error-report.h" |
| #include "qemu/option.h" |
| -#include "s390-pci-bus.h" |
| +#include "hw/s390x/s390-pci-bus.h" |
| #include "sysemu/reset.h" |
| #include "hw/s390x/storage-keys.h" |
| #include "hw/s390x/storage-attributes.h" |
| diff --git a/hw/s390x/s390-pci-bus.h b/include/hw/s390x/s390-pci-bus.h |
| similarity index 100% |
| rename from hw/s390x/s390-pci-bus.h |
| rename to include/hw/s390x/s390-pci-bus.h |
| diff --git a/hw/s390x/s390-pci-inst.h b/include/hw/s390x/s390-pci-inst.h |
| similarity index 100% |
| rename from hw/s390x/s390-pci-inst.h |
| rename to include/hw/s390x/s390-pci-inst.h |
| -- |
| 2.27.0 |
| |