[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 08/22] s390x: move sclp_service_call() to sclp.h
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v5 08/22] s390x: move sclp_service_call() to sclp.h |
Date: |
Wed, 13 Sep 2017 15:24:03 +0200 |
Implemented in sclp.c, so let's move it to the right include file.
Fix up one include. Do a forward declaration of struct CPUS390XState to
fix the two sclp consoles complaining.
Signed-off-by: David Hildenbrand <address@hidden>
---
include/hw/s390x/sclp.h | 2 ++
target/s390x/cpu.h | 1 -
target/s390x/misc_helper.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h
index a72d096081..847ff32f85 100644
--- a/include/hw/s390x/sclp.h
+++ b/include/hw/s390x/sclp.h
@@ -16,6 +16,7 @@
#include "hw/sysbus.h"
#include "hw/qdev.h"
+#include "target/s390x/cpu-qom.h"
#define SCLP_CMD_CODE_MASK 0xffff00ff
@@ -242,5 +243,6 @@ sclpMemoryHotplugDev *init_sclp_memory_hotplug_dev(void);
sclpMemoryHotplugDev *get_sclp_memory_hotplug_dev(void);
void sclp_service_interrupt(uint32_t sccb);
void raise_irq_cpu_hotplug(void);
+int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);
#endif
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h
index 4a0a59dfbc..5295bd3c66 100644
--- a/target/s390x/cpu.h
+++ b/target/s390x/cpu.h
@@ -722,6 +722,5 @@ 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);
-int sclp_service_call(CPUS390XState *env, uint64_t sccb, uint32_t code);
#endif
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index b142db71c6..8b07535b02 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -35,6 +35,7 @@
#include "sysemu/sysemu.h"
#include "hw/s390x/ebcdic.h"
#include "hw/s390x/s390-virtio-hcall.h"
+#include "hw/s390x/sclp.h"
#endif
/* #define DEBUG_HELPER */
--
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, 2017/09/13
- [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 <=
- [Qemu-devel] [PATCH v5 07/22] target/s390x: move some s390x typedefs to cpu-qom.h, David Hildenbrand, 2017/09/13
[Qemu-devel] [PATCH v5 10/22] target/s390x: use program_interrupt() in per_check_exception(), David Hildenbrand, 2017/09/13
[Qemu-devel] [PATCH v5 11/22] s390x: allow only 1 CPU with TCG, David Hildenbrand, 2017/09/13