From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YTji6-0006kj-8P for qemu-devel@nongnu.org; Thu, 05 Mar 2015 23:18:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YTjhw-0006Ix-6F for qemu-devel@nongnu.org; Thu, 05 Mar 2015 23:18:02 -0500 From: David Gibson Date: Fri, 6 Mar 2015 15:18:23 +1100 Message-Id: <1425615506-1829-4-git-send-email-david@gibson.dropbear.id.au> In-Reply-To: <1425615506-1829-1-git-send-email-david@gibson.dropbear.id.au> References: <1425615506-1829-1-git-send-email-david@gibson.dropbear.id.au> Subject: [Qemu-devel] [PATCH 3/6] pc: Use MachineClass callbacks for "irq" and "pic" hmp commands List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: agraf@suse.de, mst@redhat.com, andreas.faerber@web.de, lcapitulino@redhat.com Cc: blauwirbel@gmail.com, michael@walle.cc, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Currently PC machine types rely on fallback code in the monitor implementation to correctly implement these hmp commands. Now that we have MachineClass callbacks to control this properly, instantiate them in pc_generic_machine_class_init(). Since this sets the MachineClass callbacks correctly for all x86 machine types, we can now remove the TARGET_I386 fallback case from the monitor code. Signed-off-by: David Gibson --- hw/i386/pc.c | 2 ++ monitor.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b229856..cb48165 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1522,6 +1522,8 @@ static void pc_generic_machine_class_init(ObjectClass *oc, void *data) mc->default_display = qm->default_display; mc->compat_props = qm->compat_props; mc->hw_version = qm->hw_version; + mc->hmp_info_irq = i8259_hmp_info_irq; + mc->hmp_info_pic = i8259_hmp_info_pic; } void qemu_register_pc_machine(QEMUMachine *m) diff --git a/monitor.c b/monitor.c index ca226a9..30da438 100644 --- a/monitor.c +++ b/monitor.c @@ -1078,7 +1078,7 @@ static void hmp_info_pic(Monitor *mon, const QDict *qdict) sun4m_hmp_info_pic(mon, qdict); #elif defined(TARGET_LM32) lm32_hmp_info_pic(mon, qdict); -#elif defined(TARGET_i386) || defined(TARGET_PPC) || defined(TARGET_MIPS) +#elif defined(TARGET_PPC) || defined(TARGET_MIPS) i8259_hmp_info_pic(mon, qdict); #endif } @@ -1100,7 +1100,7 @@ static void hmp_info_irq(Monitor *mon, const QDict *qdict) sun4m_hmp_info_irq(mon, qdict); #elif defined(TARGET_LM32) lm32_hmp_info_irq(mon, qdict); -#elif defined(TARGET_i386) || defined(TARGET_PPC) || defined(TARGET_MIPS) +#elif defined(TARGET_PPC) || defined(TARGET_MIPS) i8259_hmp_info_irq(mon, qdict); #endif } -- 2.1.0