OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

HMP pull 

Just Wanpeng's pull request this time, but
 this pull is as much about me checking out my
 process.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJX8+W6AAoJEAUWMx68W/3nuEEQAJTdAGV5El6ueF7CLrhL/06g
 bhlxkkhoTfb9UiAAt3K2FpgsQ0ObzQ7OnpuB4EAct9ix0HeZbtXRH7XFEeLCc0SN
 4eQC4CKMm3IM+Hz3zg+hsYcwDydE7shnXRiy+cBUmZjbbquEAyik2wymcrWk7Le5
 zdHfgoD7oN8pdDLnplaGekPCMOSv88ecTCkTwj13AO49YQLLzQeGn1ALfm9Xwe+j
 wEAdkvAbjT81e5QyQvRcDTBChoWg6ttqnSdmhAD/3ZwyA3V0SLNOsTrexy4p23VX
 oXRyXB1tCyA88oOpkbOvJmFT2/VJl1Ij8+9J9LMCGlKDYE0ceWIFIAzw75moY0BP
 WGwv0qgZ8qK7zXc8Mne2NCHabJ1WV8Z4wsr1qCHqQGeZRbJt/77MXt2ePqbE9hbK
 psV9RwhqATQAhmBNEU1uGZ2/2aXqrpUFGgm9f9DVEVdL/tQX3DOHzAjMzKkEdk6T
 dsSBrdiVSAk9if/sj/7ObXV/qdpNxhcEyrg51uHPA02EJvF8Hlm1w/dSfc1lYCDR
 u1UGkn52Kc30wJ1QfyMyYJawZpWzrdnCmFVxSkCqBVqu80z5+2V7HigI7D7/Ielp
 zkVV3FXvGQwUslKdidLtVL/+NfUb2m0nJOADdBiDvhFEtvbiapQtcvPIH5UWCiXB
 VTYcIS+wksOvWCBg7bfp
 =eXab
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20161004' into staging

HMP pull

Just Wanpeng's pull request this time, but
this pull is as much about me checking out my
process.

# gpg: Signature made Tue 04 Oct 2016 18:24:10 BST
# gpg:                using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@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: 45F5 C71B 4A0C B7FB 977A  9FA9 0516 331E BC5B FDE7

* remotes/dgilbert/tags/pull-hmp-20161004:
  hmp: fix qemu crash due to ioapic state dump w/ split irqchip

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2016-10-04 18:57:12 +01:00
parent bbc4c3f4f3 456d97d364
commit a65b6f27ce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target-i386/monitor.c
View File

@ -504,7 +504,8 @@ void hmp_info_local_apic(Monitor *mon, const QDict *qdict)
void hmp_info_io_apic(Monitor *mon, const QDict *qdict)
{
if (kvm_irqchip_in_kernel()) {
if (kvm_irqchip_in_kernel() &&
!kvm_irqchip_is_split()) {
kvm_ioapic_dump_state(mon, qdict);
} else {
ioapic_dump_state(mon, qdict);