summaryrefslogtreecommitdiff
path: root/hw/s390x
diff options
context:
space:
mode:
authorCornelia Huck <cornelia.huck@de.ibm.com>2013-02-07 02:20:51 +0000
committerAnthony Liguori <aliguori@us.ibm.com>2013-02-13 11:56:02 -0600
commit91b0a8f33419573c1d741e49559bfb666fd8b1f0 (patch)
tree7b567f0af4b64b3f2274719b008f21f5f4b7ec7d /hw/s390x
parentbd9a8d852c857fd19c4626acaac1d4979f816f3a (diff)
s390: Fix handling of iscs.
There are two ways to express an interruption subclass: - As a bitmask, as used in cr6. - As a number, as used in the I/O interruption word. Unfortunately, we have treated to I/O interruption word as if it contained the bitmask as well, which went unnoticed so far as - (queued-for-next) kvm made the same mistake, and - Linux guest kernels don't check the isc value in the I/O interruption word for subchannel interrupts. Make sure that we treat the I/O interruption word correctly. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'hw/s390x')
-rw-r--r--hw/s390x/css.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 3244201fc..85f6f22a7 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -87,7 +87,7 @@ static void css_inject_io_interrupt(SubchDev *sch)
css_build_subchannel_id(sch),
sch->schid,
sch->curr_status.pmcw.intparm,
- (0x80 >> isc) << 24);
+ isc << 27);
}
void css_conditional_io_interrupt(SubchDev *sch)
@@ -111,7 +111,7 @@ void css_conditional_io_interrupt(SubchDev *sch)
css_build_subchannel_id(sch),
sch->schid,
sch->curr_status.pmcw.intparm,
- (0x80 >> isc) << 24);
+ isc << 27);
}
}