diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2013-02-07 02:20:51 +0000 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-13 11:56:02 -0600 |
| commit | 91b0a8f33419573c1d741e49559bfb666fd8b1f0 (patch) | |
| tree | 7b567f0af4b64b3f2274719b008f21f5f4b7ec7d /target-s390x/cpu.h | |
| parent | bd9a8d852c857fd19c4626acaac1d4979f816f3a (diff) | |
| download | qemu-91b0a8f33419573c1d741e49559bfb666fd8b1f0.zip qemu-91b0a8f33419573c1d741e49559bfb666fd8b1f0.tar.gz qemu-91b0a8f33419573c1d741e49559bfb666fd8b1f0.tar.bz2 | |
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 'target-s390x/cpu.h')
| -rw-r--r-- | target-s390x/cpu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 01e59b9..fa8dfe0 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -1001,7 +1001,7 @@ static inline void cpu_inject_io(S390CPU *cpu, uint16_t subchannel_id, uint32_t io_int_parm, uint32_t io_int_word) { CPUS390XState *env = &cpu->env; - int isc = ffs(io_int_word << 2) - 1; + int isc = IO_INT_WORD_ISC(io_int_word); if (env->io_index[isc] == MAX_IO_QUEUE - 1) { /* ugh - can't queue anymore. Let's drop. */ |