diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-05-14 18:53:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-05-14 18:53:42 +0100 |
| commit | fbd3a489df9953e2a5d017c922f3c103b2426952 (patch) | |
| tree | f7c194210dd28ff40ac1b89337a7e819c58f69af /include | |
| parent | a9cb55a3562a16f7a4c22290f52e2313a3c05b6a (diff) | |
| parent | b0dad618baad1efb014c88f4507492a79f2eaf1c (diff) | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20180514' into staging
Some s390x fixes/cleanups, mainly in the reset area and build fixes
for recent compilers (GCC 8 and clang 6.0.0).
# gpg: Signature made Mon 14 May 2018 16:32:20 BST
# gpg: using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg: aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg: aka "Cornelia Huck <cohuck@kernel.org>"
# gpg: aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20180514:
target/s390x: Fix brace Werror with clang 6.0.0
s390x: refactor reset/reipl handling
s390x/ccw: make sure all ccw devices are properly reset
virtio-ccw: common reset handler
pc-bios/s390-ccw: struct tpi_info must be declared as aligned(4)
s390x/css: disabled subchannels cannot be status pending
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/s390x/s390-virtio-ccw.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h index ac896e31ea..ab88d49d10 100644 --- a/include/hw/s390x/s390-virtio-ccw.h +++ b/include/hw/s390x/s390-virtio-ccw.h @@ -53,6 +53,4 @@ bool cpu_model_allowed(void); */ bool css_migration_enabled(void); -void subsystem_reset(void); - #endif |