diff options
| author | David Hildenbrand <david@redhat.com> | 2017-09-13 15:24:00 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-09-19 18:31:31 +0200 |
| commit | 2c98a6c1ca20d8b0463cf1d3463f4275b5892da5 (patch) | |
| tree | 28dcbb524966b7c180f0226c9f1ebf9360214725 | |
| parent | 7d57754690268fe87bf75cd180d9176c6863875d (diff) | |
| download | qemu-2c98a6c1ca20d8b0463cf1d3463f4275b5892da5.zip qemu-2c98a6c1ca20d8b0463cf1d3463f4275b5892da5.tar.gz qemu-2c98a6c1ca20d8b0463cf1d3463f4275b5892da5.tar.bz2 | |
s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h
Implemented in hw/s390x/s390-virtio-hcall.c, so let's move it to the
right header file.
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-6-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | hw/s390x/s390-virtio-hcall.h | 1 | ||||
| -rw-r--r-- | target/s390x/cpu.h | 1 | ||||
| -rw-r--r-- | target/s390x/kvm.c | 1 | ||||
| -rw-r--r-- | target/s390x/misc_helper.c | 1 |
4 files changed, 3 insertions, 1 deletions
diff --git a/hw/s390x/s390-virtio-hcall.h b/hw/s390x/s390-virtio-hcall.h index 59fcba3..cbc270e 100644 --- a/hw/s390x/s390-virtio-hcall.h +++ b/hw/s390x/s390-virtio-hcall.h @@ -17,4 +17,5 @@ typedef int (*s390_virtio_fn)(const uint64_t *args); void s390_register_virtio_hypercall(uint64_t code, s390_virtio_fn fn); +int s390_virtio_hypercall(CPUS390XState *env); #endif /* HW_S390_VIRTIO_HCALL_H */ diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 0bd97a5..7073fa5 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -723,6 +723,5 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf, 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); -int s390_virtio_hypercall(CPUS390XState *env); #endif diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 375369f..720cb1d 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -48,6 +48,7 @@ #include "hw/s390x/ebcdic.h" #include "exec/memattrs.h" #include "hw/s390x/s390-virtio-ccw.h" +#include "hw/s390x/s390-virtio-hcall.h" #ifndef DEBUG_KVM #define DEBUG_KVM 0 diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 50cc046..b142db7 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -34,6 +34,7 @@ #include "sysemu/cpus.h" #include "sysemu/sysemu.h" #include "hw/s390x/ebcdic.h" +#include "hw/s390x/s390-virtio-hcall.h" #endif /* #define DEBUG_HELPER */ |