yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-s390x-pci-Move-header-files-to-include-hw-s390x.patch

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