diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-20 20:59:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-20 20:59:05 +0100 |
| commit | 3b55fbdcb048bf82e82c29b555d0918b83fc40a5 (patch) | |
| tree | 844b7da697d25d194e626ee3dddf6d911a28b949 /include/hw/s390x/css-bridge.h | |
| parent | 6a426eb27ec17684808ab87374f51d6ed3a47835 (diff) | |
| parent | 2a79eb1a616a07b0e8c41430f03af254fefe219d (diff) | |
| download | focaccia-qemu-3b55fbdcb048bf82e82c29b555d0918b83fc40a5.tar.gz focaccia-qemu-3b55fbdcb048bf82e82c29b555d0918b83fc40a5.zip | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160720' into staging
Fixes for s390x in the css area. # gpg: Signature made Wed 20 Jul 2016 15:12:43 BST # gpg: using RSA key 0xDECF6B93C6F02FAF # gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>" # gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>" # Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF * remotes/cohuck/tags/s390x-20160720: s390x/css: provide a dev_path for css devices s390x/css: sch_handle_start_func() handles resume, too s390x/css: copy CCW format bit from ORB to SCSW Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/s390x/css-bridge.h')
| -rw-r--r-- | include/hw/s390x/css-bridge.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/hw/s390x/css-bridge.h b/include/hw/s390x/css-bridge.h index ad73c1faf6..5a0203be5f 100644 --- a/include/hw/s390x/css-bridge.h +++ b/include/hw/s390x/css-bridge.h @@ -16,7 +16,14 @@ #include "hw/qdev-core.h" /* virtual css bridge */ +typedef struct VirtualCssBridge { + SysBusDevice sysbus_dev; + bool css_dev_path; +} VirtualCssBridge; + #define TYPE_VIRTUAL_CSS_BRIDGE "virtual-css-bridge" +#define VIRTUAL_CSS_BRIDGE(obj) \ + OBJECT_CHECK(VirtualCssBridge, (obj), TYPE_VIRTUAL_CSS_BRIDGE) /* virtual css bus type */ typedef struct VirtualCssBus { |