From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5xXI-0000iJ-PQ for qemu-devel@nongnu.org; Fri, 19 Jun 2015 10:44:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5xXH-0000J4-LS for qemu-devel@nongnu.org; Fri, 19 Jun 2015 10:44:52 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:47959 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5xXH-0000IK-7M for qemu-devel@nongnu.org; Fri, 19 Jun 2015 10:44:51 -0400 From: "Denis V. Lunev" Date: Fri, 19 Jun 2015 17:48:18 +0300 Message-Id: <1434725298-22666-9-git-send-email-den@openvz.org> In-Reply-To: <1434725298-22666-1-git-send-email-den@openvz.org> References: <1434725298-22666-1-git-send-email-den@openvz.org> Subject: [Qemu-devel] [PATCH 8/8] hmp: implemented io apic dump state for emulator List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Luiz Capitulino , "Denis V. Lunev" , Paolo Bonzini , qemu-devel@nongnu.org, Pavel Butsykin From: Pavel Butsykin Added support emulator for the hmp command "info apic-io" Signed-off-by: Pavel Butsykin Signed-off-by: Denis V. Lunev CC: Paolo Bonzini CC: Luiz Capitulino --- hw/intc/ioapic.c | 12 ++++++++++++ include/hw/i386/pc.h | 1 + monitor.c | 2 ++ 3 files changed, 15 insertions(+) diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c index b527932..8c3aeae 100644 --- a/hw/intc/ioapic.c +++ b/hw/intc/ioapic.c @@ -20,6 +20,7 @@ * License along with this library; if not, see . */ +#include "monitor/monitor.h" #include "hw/hw.h" #include "hw/i386/pc.h" #include "hw/i386/ioapic.h" @@ -137,6 +138,17 @@ void ioapic_eoi_broadcast(int vector) } } +void ioapic_dump_state(Monitor *mon, const QDict *qdict) +{ + int i; + + for (i = 0; i < MAX_IOAPICS; i++) { + if (ioapics[i] != 0) { + ioapic_print_redtbl(mon, ioapics[i]); + } + } +} + static uint64_t ioapic_mem_read(void *opaque, hwaddr addr, unsigned int size) { diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 437085f..142cebe 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -126,6 +126,7 @@ void hmp_info_irq(Monitor *mon, const QDict *qdict); /* ioapic.c */ void kvm_ioapic_dump_state(Monitor *mon, const QDict *qdict); +void ioapic_dump_state(Monitor *mon, const QDict *qdict); /* Global System Interrupts */ diff --git a/monitor.c b/monitor.c index 5449663..192b09d 100644 --- a/monitor.c +++ b/monitor.c @@ -962,6 +962,8 @@ static void hmp_info_apic_io(Monitor *mon, const QDict *qdict) { if (kvm_irqchip_in_kernel()) { kvm_ioapic_dump_state(mon, qdict); + } else { + ioapic_dump_state(mon, qdict); } } #else -- 1.9.1