diff options
| author | Peter Maydell | 2016-10-04 19:57:12 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-10-04 19:57:12 +0200 |
| commit | a65b6f27ce65e2e4f771f69d549ffa455a4d543a (patch) | |
| tree | 34e0c9d503e9427cf4c0f120b0779dd207388270 /target-i386/monitor.c | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | hmp: fix qemu crash due to ioapic state dump w/ split irqchip (diff) | |
| download | qemu-a65b6f27ce65e2e4f771f69d549ffa455a4d543a.tar.gz qemu-a65b6f27ce65e2e4f771f69d549ffa455a4d543a.tar.xz qemu-a65b6f27ce65e2e4f771f69d549ffa455a4d543a.zip | |
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>
Diffstat (limited to 'target-i386/monitor.c')
| -rw-r--r-- | target-i386/monitor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target-i386/monitor.c b/target-i386/monitor.c index fccfe40ab7..9a3b4d746e 100644 --- a/target-i386/monitor.c +++ b/target-i386/monitor.c @@ -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); |