diff options
| author | David Hildenbrand | 2017-09-13 15:24:01 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2017-09-19 18:31:31 +0200 |
| commit | 19c69829d64ff3101a91663354a9d9bc755cd642 (patch) | |
| tree | 3c78b397806b0c999391d5488f008e63d0467549 | |
| parent | s390x: move s390_virtio_hypercall() to s390-virtio-hcall.h (diff) | |
| download | qemu-19c69829d64ff3101a91663354a9d9bc755cd642.tar.gz qemu-19c69829d64ff3101a91663354a9d9bc755cd642.tar.xz qemu-19c69829d64ff3101a91663354a9d9bc755cd642.zip | |
s390x: move subsystem_reset() to s390-virtio-ccw.h
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 <thuth@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170913132417.24384-7-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | include/hw/s390x/s390-virtio-ccw.h | 2 | ||||
| -rw-r--r-- | target/s390x/cpu.h | 1 | ||||
| -rw-r--r-- | target/s390x/diag.c | 1 |
3 files changed, 3 insertions, 1 deletions
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) { |