[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 06/22] s390x: move subsystem_reset() to s390-virt
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v5 06/22] s390x: move subsystem_reset() to s390-virtio-ccw.h |
Date: |
Wed, 13 Sep 2017 15:24:01 +0200 |
Implemented in s390-virtio-ccw.c, so move it to the right header.
We can also drop the extern. Fix up one include.
Reviewed-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
include/hw/s390x/s390-virtio-ccw.h | 2 ++
target/s390x/cpu.h | 1 -
target/s390x/diag.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/hw/s390x/s390-virtio-ccw.h
b/include/hw/s390x/s390-virtio-ccw.h
index 41a9d2862b..a9a90c2022 100644
--- a/include/hw/s390x/s390-virtio-ccw.h
+++ b/include/hw/s390x/s390-virtio-ccw.h
@@ -56,4 +56,6 @@ bool gs_allowed(void);
*/
bool css_migration_enabled(void);
+void subsystem_reset(void);
+
#endif
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 7073fa59e9..372f7d8885 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -721,7 +721,6 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t
ar, void *hostbuf,
/* outside of target/s390x/ */
S390CPU *s390_cpu_addr2state(uint16_t cpu_addr);
-extern void subsystem_reset(void);
int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);
#endif
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index e6b5e6de37..82a623948d 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -20,6 +20,7 @@
#include "hw/watchdog/wdt_diag288.h"
#include "sysemu/cpus.h"
#include "hw/s390x/ipl.h"
+#include "hw/s390x/s390-virtio-ccw.h"
static int modified_clear_reset(S390CPU *cpu)
{
--
2.13.5
- [Qemu-devel] [PATCH v5 00/22] s390x cleanups and CPU hotplug via device_add, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 01/22] exec, dump, i386, ppc, s390x: don't include exec/cpu-all.h explicitly, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 02/22] cpu: drop old comments describing members, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 03/22] s390x: get rid of s390-virtio.c, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 04/22] s390x: rename s390-virtio.h to s390-virtio-hcall.h, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 05/22] s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 06/22] s390x: move subsystem_reset() to s390-virtio-ccw.h,
David Hildenbrand <=
- [Qemu-devel] [PATCH v5 09/22] target/s390x: use trigger_pgm_exception() in s390_cpu_handle_mmu_fault(), David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 08/22] s390x: move sclp_service_call() to sclp.h, David Hildenbrand, 2017/09/13
- [Qemu-devel] [PATCH v5 07/22] target/s390x: move some s390x typedefs to cpu-qom.h, David Hildenbrand, 2017/09/13