]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 24 Nov 2014 13:50:22 +0000 (13:50 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 24 Nov 2014 13:50:22 +0000 (13:50 +0000)
commita31a7475e930dc0b8f27fb71f01ff4f0db92d1f4
tree1b0c5806fb6599f184a861598ed057481ee1300f
parent0e88f478508b566152c6681f4889ed9830a2c0a5
parent5224c88dd3f771702d450780a25f155e0fc8bb2b
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

Three patches to fix ExtINT for the QEMU implementation of the local APIC.

# gpg: Signature made Mon 24 Nov 2014 13:38:36 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# 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:
  apic: fix incorrect handling of ExtINT interrupts wrt processor priority
  apic: fix loss of IPI due to masked ExtINT
  apic: avoid getting out of halted state on masked PIC interrupts

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>