diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2013-02-22 09:01:32 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-03-08 21:17:46 +0100 |
| commit | 38dd7cc776bbde7edbe60ba5d0abbd156e7e0f2f (patch) | |
| tree | 20a39fe3dad1c6892b8c7dad8cbd09f48caadd41 /target-s390x | |
| parent | 35569cea79fd3f5ccb5b23ca024c7d3aa4d24e75 (diff) | |
| download | qemu-38dd7cc776bbde7edbe60ba5d0abbd156e7e0f2f.tar.gz qemu-38dd7cc776bbde7edbe60ba5d0abbd156e7e0f2f.tar.bz2 qemu-38dd7cc776bbde7edbe60ba5d0abbd156e7e0f2f.zip | |
s390/css: Fix subchannel detection
We have to consider the m bit to find the real channel subsystem when
determining the last subchannel.
If we fail to take this into account, removal of a subchannel in
the middle of a big list of devices will stop device detection after
a reboot.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-s390x')
| -rw-r--r-- | target-s390x/cpu.h | 2 | ||||
| -rw-r--r-- | target-s390x/ioinst.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index e450db74a2..9cb739da1e 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -404,7 +404,7 @@ SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid, bool css_subch_visible(SubchDev *sch); void css_conditional_io_interrupt(SubchDev *sch); int css_do_stsch(SubchDev *sch, SCHIB *schib); -bool css_schid_final(uint8_t cssid, uint8_t ssid, uint16_t schid); +bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid); int css_do_msch(SubchDev *sch, SCHIB *schib); int css_do_xsch(SubchDev *sch); int css_do_csch(SubchDev *sch); diff --git a/target-s390x/ioinst.c b/target-s390x/ioinst.c index e3531f365e..28c508d541 100644 --- a/target-s390x/ioinst.c +++ b/target-s390x/ioinst.c @@ -316,7 +316,7 @@ int ioinst_handle_stsch(CPUS390XState *env, uint64_t reg1, uint32_t ipb) cc = 3; } } else { - if (css_schid_final(cssid, ssid, schid)) { + if (css_schid_final(m, cssid, ssid, schid)) { cc = 3; /* No more subchannels in this css/ss */ } else { /* Store an empty schib. */ |