diff mbox

hmp: fix qemu crash due to ioapic state dump w/ split irqchip

Message ID 1474602456-3232-1-git-send-email-wanpeng.li@hotmail.com
State New
Headers show

Commit Message

Wanpeng Li Sept. 23, 2016, 3:47 a.m. UTC
From: Wanpeng Li <wanpeng.li@hotmail.com>

The qemu will crash when info ioapic through hmp if irqchip 
is split. Below message is splat:

KVM_GET_IRQCHIP failed: Unknown error -6

This patch fix it by dumping the ioapic state from the qemu 
emulated ioapic if irqchip is split.

Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
---
 target-i386/monitor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Peter Xu Sept. 23, 2016, 9:08 a.m. UTC | #1
On Fri, Sep 23, 2016 at 11:47:36AM +0800, Wanpeng Li wrote:
> From: Wanpeng Li <wanpeng.li@hotmail.com>
> 
> The qemu will crash when info ioapic through hmp if irqchip 
> is split. Below message is splat:
> 
> KVM_GET_IRQCHIP failed: Unknown error -6
> 
> This patch fix it by dumping the ioapic state from the qemu 
> emulated ioapic if irqchip is split.
> 
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>

Reviewed-by: Peter Xu <peterx@redhat.com>
Paolo Bonzini Sept. 26, 2016, 8:23 a.m. UTC | #2
On 23/09/2016 05:47, Wanpeng Li wrote:
> From: Wanpeng Li <wanpeng.li@hotmail.com>
> 
> The qemu will crash when info ioapic through hmp if irqchip 
> is split. Below message is splat:
> 
> KVM_GET_IRQCHIP failed: Unknown error -6
> 
> This patch fix it by dumping the ioapic state from the qemu 
> emulated ioapic if irqchip is split.
> 
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
> ---
>  target-i386/monitor.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/target-i386/monitor.c b/target-i386/monitor.c
> index fccfe40..bf1e983 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);
> 

Queued, thanks.
diff mbox

Patch

diff --git a/target-i386/monitor.c b/target-i386/monitor.c
index fccfe40..bf1e983 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);