diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-07-06 18:18:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-07-06 18:18:08 +0100 |
| commit | 43a473993fd9378bf850dcafa68eb6dee8c300f8 (patch) | |
| tree | c24e382dbfbbeca0a84f219766ee9a0edd523b2a /hw | |
| parent | 5fd4a9c97397bc0819a919de7a62ec972ec85260 (diff) | |
| parent | e20122ff0faf07cb701d35e39e106d1783c07725 (diff) | |
| download | qemu-43a473993fd9378bf850dcafa68eb6dee8c300f8.zip qemu-43a473993fd9378bf850dcafa68eb6dee8c300f8.tar.gz qemu-43a473993fd9378bf850dcafa68eb6dee8c300f8.tar.bz2 | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
Bug fixes.
# gpg: Signature made Fri 06 Jul 2018 17:40:06 BST
# gpg: using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>"
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1
# Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83
* remotes/bonzini/tags/for-upstream:
checkpatch: handle token pasting better
ioapic: remove useless lower bounds check
pr-manager-helper: fix memory leak on event
qemu-char: check errno together with ret < 0
i386: fix '-cpu ?' output for host cpu type
qtest: Use cpu address space instead of system memory
pr-helper: Rework socket path handling
pr-helper: avoid error on PR IN command with zero request size
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/intc/ioapic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index b393780..b6896ac 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -152,7 +152,7 @@ static void ioapic_set_irq(void *opaque, int vector, int level) if (vector == 0) { vector = 2; } - if (vector >= 0 && vector < IOAPIC_NUM_PINS) { + if (vector < IOAPIC_NUM_PINS) { uint32_t mask = 1 << vector; uint64_t entry = s->ioredtbl[vector]; |