diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-13 09:27:17 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-13 09:27:17 +0100 |
| commit | f4f3082b0c35b5aa84616dc2dc8c9c0aac2d6a1c (patch) | |
| tree | a71264f9bc2c5c2d497eda81b5ecc0535c6a737a /include/hw | |
| parent | 9bba618f18b1a60a3f2668db82b453f6cd9467c0 (diff) | |
| parent | fbe8202ea81519a42855830059ccc8e10b58dfa5 (diff) | |
| download | focaccia-qemu-f4f3082b0c35b5aa84616dc2dc8c9c0aac2d6a1c.tar.gz focaccia-qemu-f4f3082b0c35b5aa84616dc2dc8c9c0aac2d6a1c.zip | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170608' into staging
s390x: misc fixes bunch of fixes - reject MIDA accesses for CCWs - cpumodel fixes - cross-build fix for bios - migration improvements # gpg: Signature made Thu 08 Jun 2017 14:10:29 BST # gpg: using RSA key 0x117BBC80B5A61C7C # gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>" # Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C * remotes/borntraeger/tags/s390x-20170608: s390x/cpumodel: improve defintion search without an IBC s390x/cpumodel: take care of the cpuid format bit for KVM pc-bios/s390-ccw: use STRIP variable in Makefile s390x/css: fence off MIDA s390x/css: catch section mismatch on load Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw')
| -rw-r--r-- | include/hw/s390x/ioinst.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/s390x/ioinst.h b/include/hw/s390x/ioinst.h index c559f53426..92d15655e4 100644 --- a/include/hw/s390x/ioinst.h +++ b/include/hw/s390x/ioinst.h @@ -182,6 +182,7 @@ typedef struct CCW1 { #define CCW_FLAG_PCI 0x08 #define CCW_FLAG_IDA 0x04 #define CCW_FLAG_SUSPEND 0x02 +#define CCW_FLAG_MIDA 0x01 #define CCW_CMD_NOOP 0x03 #define CCW_CMD_BASIC_SENSE 0x04 |