Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 64bef038e777208e4c35beae7f980fbd994b87eb
https://github.com/qemu/qemu/commit/64bef038e777208e4c35beae7f980fbd994b87eb
Author: Cameron Esfahani
Date: 2019-12-03 (Tue, 03 Dec 2019)
Changed paths:
M target/i386/hvf/hvf.c
M target/i386/hvf/x86hvf.c
Log Message:
---
hvf: correctly inject VMCS_INTR_T_HWINTR versus VMCS_INTR_T_SWINTR.
Previous implementation in hvf_inject_interrupts() would always inject
VMCS_INTR_T_SWINTR even when VMCS_INTR_T_HWINTR was required. Now
correctly determine when VMCS_INTR_T_HWINTR is appropriate versus
VMCS_INTR_T_SWINTR.
Make sure to clear ins_len and has_error_code when ins_len isn't
valid and error_code isn't set.
Signed-off-by: Cameron Esfahani
Message-Id:
Signed-off-by: Paolo Bonzini
Commit: 24d68f3737be432df15694f7c7a2d26d7d7d1189
https://github.com/qemu/qemu/commit/24d68f3737be432df15694f7c7a2d26d7d7d1189
Author: Peter Maydell
Date: 2019-12-03 (Tue, 03 Dec 2019)
Changed paths:
M target/i386/hvf/hvf.c
M target/i386/hvf/x86hvf.c
Log Message:
---
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
* last HVF fix (Cameron)
# gpg: Signature made Tue 03 Dec 2019 08:11:51 GMT
# gpg:using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:issuer "pbonz...@redhat.com"
# gpg: Good signature from "Paolo Bonzini " [full]
# gpg: aka "Paolo Bonzini " [full]
# 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:
hvf: correctly inject VMCS_INTR_T_HWINTR versus VMCS_INTR_T_SWINTR.
Signed-off-by: Peter Maydell
Compare: https://github.com/qemu/qemu/compare/39032981fa85...24d68f3737be