diff options
| author | David Hildenbrand <david@redhat.com> | 2017-09-13 15:24:03 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-09-19 18:31:31 +0200 |
| commit | 53d8e91d64ce2655f5945db2fe4c1ac7e00957a0 (patch) | |
| tree | 52854dfc6634c1a67ac59729af1244fff2db2b3c | |
| parent | ef2974cc270d51959ce90df6b4d4d41635d7a603 (diff) | |
| download | qemu-53d8e91d64ce2655f5945db2fe4c1ac7e00957a0.zip qemu-53d8e91d64ce2655f5945db2fe4c1ac7e00957a0.tar.gz qemu-53d8e91d64ce2655f5945db2fe4c1ac7e00957a0.tar.bz2 | |
s390x: move sclp_service_call() to sclp.h
Implemented in sclp.c, so let's move it to the right include file.
Also adjust some includes.
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-9-david@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | include/hw/s390x/sclp.h | 2 | ||||
| -rw-r--r-- | target/s390x/cpu.h | 1 | ||||
| -rw-r--r-- | target/s390x/misc_helper.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/hw/s390x/sclp.h b/include/hw/s390x/sclp.h index a72d096..847ff32 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 4a0a59d..5295bd3 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 b142db7..8b07535 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 */ |