[Qemu-devel] [PULL 0/1] HMP queue

[Qemu-devel] [PULL 0/1] HMP queue

[Dr. David Alan Gilbert (git)]

From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

The following changes since commit bbc4c3f4f3c624e2de64fdcb79f4dd8c1a508e9d:

  Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-10-04 14:25:08 +0100)

are available in the git repository at:

  git://github.com/dagrh/qemu.git tags/pull-hmp-20161004

for you to fetch changes up to 456d97d364e34adc4e68cbd51c2ad6ecd548492d:

  hmp: fix qemu crash due to ioapic state dump w/ split irqchip (2016-10-04 17:16:15 +0100)

----------------------------------------------------------------
HMP pull

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

----------------------------------------------------------------
Wanpeng Li (1):
      hmp: fix qemu crash due to ioapic state dump w/ split irqchip

 target-i386/monitor.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

[Qemu-devel] [PULL 1/1] hmp: fix qemu crash due to ioapic state dump w/ split irqchip

[Dr. David Alan Gilbert (git)]

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>
Message-Id: <1474602456-3232-1-git-send-email-wanpeng.li@hotmail.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20160923090824.GF15411@pxdev.xzpeter.org>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.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..9a3b4d7 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);
-- 
2.7.4

Re: [Qemu-devel] [PULL 0/1] HMP queue

[Peter Maydell]

On 4 October 2016 at 18:49, Dr. David Alan Gilbert (git)
<dgilbert@redhat.com> wrote:
> From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
>
> The following changes since commit bbc4c3f4f3c624e2de64fdcb79f4dd8c1a508e9d:
>
>   Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-10-04 14:25:08 +0100)
>
> are available in the git repository at:
>
>   git://github.com/dagrh/qemu.git tags/pull-hmp-20161004
>
> for you to fetch changes up to 456d97d364e34adc4e68cbd51c2ad6ecd548492d:
>
>   hmp: fix qemu crash due to ioapic state dump w/ split irqchip (2016-10-04 17:16:15 +0100)
>
> ----------------------------------------------------------------
> HMP pull
>
> Just Wanpeng's patch this time, but this pull is as much about
> me checking out my process.
>
> ----------------------------------------------------------------

Looks good to me (though your GPG key seems a bit short on signatures).

Applied, thanks.
-- PMM