From patchwork Sat Aug 29 14:08:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 32503 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 310B7B70C4 for ; Sun, 30 Aug 2009 00:11:22 +1000 (EST) Received: from localhost ([127.0.0.1]:57741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MhOeA-0002xJ-3N for incoming@patchwork.ozlabs.org; Sat, 29 Aug 2009 10:11:14 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MhOc6-0002IR-5f for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:09:06 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MhOc1-0002Gb-43 for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:09:05 -0400 Received: from [199.232.76.173] (port=47303 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MhOc0-0002GS-Uh for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:09:01 -0400 Received: from mail-ew0-f223.google.com ([209.85.219.223]:56390) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MhObz-0003lq-DF for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:09:00 -0400 Received: by ewy23 with SMTP id 23so3203536ewy.8 for ; Sat, 29 Aug 2009 07:08:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:content-type; bh=/hOcu553NbmaKxzz+BIwlJe6BGfW2SThB4VdbES+0cI=; b=OpGvhOCNNtvHrgRnuNM5lGvXlLI8BrJB8C9fTyM2ZCbYGsiOdlYzSTgx7P9wC47IZl TiF9oCEyxrPekjczor85eFeBARfygqc1dSxvDgN33mOv4VCOZNM0IrxPEmgH2c8p7wIO tNICGytfQ1bHxYZWZyoVfb6CT4luW2+g9ZI2M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=iA/OLSEMUPa+DCcuK/sEwoTywLsfMURv5DFH5aTucFKExPb/hLhdwV0SVzPsovQwJQ oFl8u7A1IUUPYjyOUcraz3mjQ7UqZcQ9hVPbOiHso1TqyQVzGIoBBAiiqqz8JVX+XfrM HRLOcirrGQybG35H/HnVZlbgZtVHykzcuTd9A= MIME-Version: 1.0 Received: by 10.210.115.4 with SMTP id n4mr1542259ebc.53.1251554938107; Sat, 29 Aug 2009 07:08:58 -0700 (PDT) From: Blue Swirl Date: Sat, 29 Aug 2009 17:08:38 +0300 Message-ID: To: qemu-devel X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH, RFC 2/5] x86/Sparc32: use device info for pic and irq X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Blue Swirl --- hw/an5206.c | 9 --------- hw/arm_pic.c | 10 ---------- hw/cris_pic_cpu.c | 5 ----- hw/i8259.c | 41 ++++++++++++++++++++++------------------- hw/microblaze_pic_cpu.c | 5 ----- hw/pc.h | 2 -- hw/shix.c | 10 ---------- hw/slavio_intctl.c | 16 ++++++---------- hw/sun4c_intctl.c | 6 ++++-- hw/sun4m.c | 15 +-------------- hw/sun4m.h | 8 -------- hw/sun4u.c | 8 -------- monitor.c | 4 ---- qemu-monitor.hx | 4 ---- 14 files changed, 33 insertions(+), 110 deletions(-) diff --git a/hw/an5206.c b/hw/an5206.c index d417d92..f2cf8ba 100644 --- a/hw/an5206.c +++ b/hw/an5206.c @@ -16,15 +16,6 @@ #define AN5206_MBAR_ADDR 0x10000000 #define AN5206_RAMBAR_ADDR 0x20000000 -/* Stub functions for hardware that doesn't exist. */ -void pic_info(Monitor *mon) -{ -} - -void irq_info(Monitor *mon) -{ -} - /* Board init. */ static void an5206_init(ram_addr_t ram_size, diff --git a/hw/arm_pic.c b/hw/arm_pic.c index f44568c..e4822f0 100644 --- a/hw/arm_pic.c +++ b/hw/arm_pic.c @@ -11,16 +11,6 @@ #include "pc.h" #include "arm-misc.h" -/* Stub functions for hardware that doesn't exist. */ -void pic_info(Monitor *mon) -{ -} - -void irq_info(Monitor *mon) -{ -} - - /* Input 0 is IRQ and input 1 is FIQ. */ static void arm_pic_cpu_handler(void *opaque, int irq, int level) { diff --git a/hw/cris_pic_cpu.c b/hw/cris_pic_cpu.c index a92d445..e4d7d1a 100644 --- a/hw/cris_pic_cpu.c +++ b/hw/cris_pic_cpu.c @@ -28,11 +28,6 @@ #define D(x) -void pic_info(Monitor *mon) -{} -void irq_info(Monitor *mon) -{} - static void cris_pic_cpu_handler(void *opaque, int irq, int level) { CPUState *env = (CPUState *)opaque; diff --git a/hw/i8259.c b/hw/i8259.c index 74acc39..5521c73 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -52,6 +52,13 @@ typedef struct PicState { uint8_t elcr; /* PIIX edge/trigger selection*/ uint8_t elcr_mask; PicState2 *pics_state; +#if defined(DEBUG_PIC) || defined (DEBUG_IRQ_COUNT) + int irq_level[16]; +#endif +#ifdef DEBUG_IRQ_COUNT + uint64_t irq_count[16]; +#endif + } PicState; struct PicState2 { @@ -62,13 +69,6 @@ struct PicState2 { void *irq_request_opaque; }; -#if defined(DEBUG_PIC) || defined (DEBUG_IRQ_COUNT) -static int irq_level[16]; -#endif -#ifdef DEBUG_IRQ_COUNT -static uint64_t irq_count[16]; -#endif - /* set irq level. If an edge is detected, then the IRR is set to 1 */ static inline void pic_set_irq1(PicState *s, int irq, int level) { @@ -183,14 +183,15 @@ static void i8259_set_irq(void *opaque, int irq, int level) PicState2 *s = opaque; #if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT) - if (level != irq_level[irq]) { + if (level != s->irq_level[irq]) { #if defined(DEBUG_PIC) printf("i8259_set_irq: irq=%d level=%d\n", irq, level); #endif - irq_level[irq] = level; + s->irq_level[irq] = level; #ifdef DEBUG_IRQ_COUNT - if (level == 1) - irq_count[irq]++; + if (level == 1) { + s->irq_count[irq]++; + } #endif } #endif @@ -506,16 +507,14 @@ static void pic_init1(int io_addr, int elcr_addr, PicState *s) qemu_register_reset(pic_reset, s); } -void pic_info(Monitor *mon) +static void pic_info(Monitor *mon, void *opaque) { + PicState2 *pic = opaque; int i; PicState *s; - if (!isa_pic) - return; - for(i=0;i<2;i++) { - s = &isa_pic->pics[i]; + s = &pic->pics[i]; monitor_printf(mon, "pic%d: irr=%02x imr=%02x isr=%02x hprio=%d " "irq_base=%02x rr_sel=%d elcr=%02x fnm=%d\n", i, s->irr, s->imr, s->isr, s->priority_add, @@ -524,19 +523,21 @@ void pic_info(Monitor *mon) } } -void irq_info(Monitor *mon) +static void irq_info(Monitor *mon, void *opaque) { #ifndef DEBUG_IRQ_COUNT monitor_printf(mon, "irq statistic code not compiled.\n"); #else int i; int64_t count; + PicState2 *pic = opaque; monitor_printf(mon, "IRQ statistics:\n"); for (i = 0; i < 16; i++) { - count = irq_count[i]; - if (count > 0) + count = pic->irq_count[i]; + if (count > 0) { monitor_printf(mon, "%2d: %" PRId64 "\n", i, count); + } } #endif } @@ -554,5 +555,7 @@ qemu_irq *i8259_init(qemu_irq parent_irq) s->pics[0].pics_state = s; s->pics[1].pics_state = s; isa_pic = s; + monitor_register_device_info("i8259.state", pic_info, s); + monitor_register_device_info("i8259.stats", irq_info, s); return qemu_allocate_irqs(i8259_set_irq, s, 16); } diff --git a/hw/microblaze_pic_cpu.c b/hw/microblaze_pic_cpu.c index 7c59382..cfd1a46 100644 --- a/hw/microblaze_pic_cpu.c +++ b/hw/microblaze_pic_cpu.c @@ -27,11 +27,6 @@ #define D(x) -void pic_info(Monitor *mon) -{} -void irq_info(Monitor *mon) -{} - static void microblaze_pic_cpu_handler(void *opaque, int irq, int level) { CPUState *env = (CPUState *)opaque; diff --git a/hw/pc.h b/hw/pc.h index 7ac2849..845f3e1 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -29,8 +29,6 @@ qemu_irq *i8259_init(qemu_irq parent_irq); int pic_read_irq(PicState2 *s); void pic_update_irq(PicState2 *s); uint32_t pic_intack_read(PicState2 *s); -void pic_info(Monitor *mon); -void irq_info(Monitor *mon); /* APIC */ typedef struct IOAPICState IOAPICState; diff --git a/hw/shix.c b/hw/shix.c index 19b0155..3c1212f 100644 --- a/hw/shix.c +++ b/hw/shix.c @@ -36,16 +36,6 @@ #define BIOS_FILENAME "shix_bios.bin" #define BIOS_ADDRESS 0xA0000000 -void irq_info(Monitor *mon) -{ - /* XXXXX */ -} - -void pic_info(Monitor *mon) -{ - /* XXXXX */ -} - static void shix_init(ram_addr_t ram_size, const char *boot_device, const char *kernel_filename, const char *kernel_cmdline, diff --git a/hw/slavio_intctl.c b/hw/slavio_intctl.c index 259e45e..df3c9ac 100644 --- a/hw/slavio_intctl.c +++ b/hw/slavio_intctl.c @@ -216,14 +216,11 @@ static CPUWriteMemoryFunc * const slavio_intctlm_mem_write[3] = { slavio_intctlm_mem_writel, }; -void slavio_pic_info(Monitor *mon, DeviceState *dev) +static void slavio_pic_info(Monitor *mon, void *opaque) { - SysBusDevice *sd; - SLAVIO_INTCTLState *s; + SLAVIO_INTCTLState *s = opaque; int i; - sd = sysbus_from_qdev(dev); - s = FROM_SYSBUS(SLAVIO_INTCTLState, sd); for (i = 0; i < MAX_CPUS; i++) { monitor_printf(mon, "per-cpu %d: pending 0x%08x\n", i, s->slaves[i].intreg_pending); @@ -232,18 +229,15 @@ void slavio_pic_info(Monitor *mon, DeviceState *dev) s->intregm_pending, s->intregm_disabled); } -void slavio_irq_info(Monitor *mon, DeviceState *dev) +static void slavio_irq_info(Monitor *mon, void *opaque) { #ifndef DEBUG_IRQ_COUNT monitor_printf(mon, "irq statistic code not compiled.\n"); #else - SysBusDevice *sd; - SLAVIO_INTCTLState *s; + SLAVIO_INTCTLState *s = opaque; int i; int64_t count; - sd = sysbus_from_qdev(dev); - s = FROM_SYSBUS(SLAVIO_INTCTLState, sd); monitor_printf(mon, "IRQ statistics:\n"); for (i = 0; i < 32; i++) { count = s->irq_count[i]; @@ -447,6 +441,8 @@ static int slavio_intctl_init1(SysBusDevice *dev) s->slaves[i].master = s; } vmstate_register(-1, &vmstate_intctl, s); + monitor_register_device_info("intctl.state", slavio_pic_info, s); + monitor_register_device_info("intctl.stats", slavio_irq_info, s); qemu_register_reset(slavio_intctl_reset, s); slavio_intctl_reset(s); return 0; diff --git a/hw/sun4c_intctl.c b/hw/sun4c_intctl.c index a0d0e97..729f29d 100644 --- a/hw/sun4c_intctl.c +++ b/hw/sun4c_intctl.c @@ -94,7 +94,7 @@ static CPUWriteMemoryFunc * const sun4c_intctl_mem_write[3] = { NULL, }; -void sun4c_pic_info(Monitor *mon, void *opaque) +static void sun4c_pic_info(Monitor *mon, void *opaque) { Sun4c_INTCTLState *s = opaque; @@ -102,7 +102,7 @@ void sun4c_pic_info(Monitor *mon, void *opaque) s->pending, s->reg); } -void sun4c_irq_info(Monitor *mon, void *opaque) +static void sun4c_irq_info(Monitor *mon, void *opaque) { #ifndef DEBUG_IRQ_COUNT monitor_printf(mon, "irq statistic code not compiled.\n"); @@ -214,6 +214,8 @@ static int sun4c_intctl_init1(SysBusDevice *dev) } register_savevm("sun4c_intctl", -1, 1, sun4c_intctl_save, sun4c_intctl_load, s); + monitor_register_device_info("intctl.state", sun4c_pic_info, s); + monitor_register_device_info("intctl.stats", sun4c_irq_info, s); qemu_register_reset(sun4c_intctl_reset, s); sun4c_intctl_reset(s); return 0; diff --git a/hw/sun4m.c b/hw/sun4m.c index d970723..d1237a6 100644 --- a/hw/sun4m.c +++ b/hw/sun4m.c @@ -209,20 +209,6 @@ static void nvram_init(m48t59_t *nvram, uint8_t *macaddr, const char *cmdline, m48t59_write(nvram, i, image[i]); } -static DeviceState *slavio_intctl; - -void pic_info(Monitor *mon) -{ - if (slavio_intctl) - slavio_pic_info(mon, slavio_intctl); -} - -void irq_info(Monitor *mon) -{ - if (slavio_intctl) - slavio_irq_info(mon, slavio_intctl); -} - void cpu_check_irqs(CPUState *env) { if (env->pil_in && (env->interrupt_index == 0 || @@ -750,6 +736,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, BlockDriverState *fd[MAX_FD]; void *fw_cfg; DriveInfo *dinfo; + DeviceState *slavio_intctl; /* init CPUs */ if (!cpu_model) diff --git a/hw/sun4m.h b/hw/sun4m.h index ce97ee5..b204cc1 100644 --- a/hw/sun4m.h +++ b/hw/sun4m.h @@ -22,14 +22,6 @@ static inline void sparc_iommu_memory_write(void *opaque, sparc_iommu_memory_rw(opaque, addr, buf, len, 1); } -/* slavio_intctl.c */ -void slavio_pic_info(Monitor *mon, DeviceState *dev); -void slavio_irq_info(Monitor *mon, DeviceState *dev); - -/* sun4c_intctl.c */ -void sun4c_pic_info(Monitor *mon, void *opaque); -void sun4c_irq_info(Monitor *mon, void *opaque); - /* sparc32_dma.c */ #include "sparc32_dma.h" diff --git a/hw/sun4u.c b/hw/sun4u.c index ece83e6..9cf4fdc 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -203,14 +203,6 @@ static unsigned long sun4u_load_kernel(const char *kernel_filename, return kernel_size; } -void pic_info(Monitor *mon) -{ -} - -void irq_info(Monitor *mon) -{ -} - void cpu_check_irqs(CPUState *env) { uint32_t pil = env->pil_in | (env->softint & ~SOFTINT_TIMER) | diff --git a/monitor.c b/monitor.c index 24e817f..d5b39eb 100644 --- a/monitor.c +++ b/monitor.c @@ -1799,10 +1799,6 @@ static const mon_cmd_t info_cmds[] = { "", "show infos for each CPU" }, { "history", "", do_info_history, "", "show the command line history", }, - { "irq", "", irq_info, - "", "show the interrupts statistics (if available)", }, - { "pic", "", pic_info, - "", "show i8259 (PIC) state", }, { "pci", "", pci_info, "", "show PCI info", }, #if defined(TARGET_I386) || defined(TARGET_SH4) diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 80d07b5..2026921 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -45,10 +45,6 @@ show the cpu registers show infos for each CPU @item info history show the command line history -@item info irq -show the interrupts statistics (if available) -@item info pic -show i8259 (PIC) state @item info pci show emulated PCI device info @item info tlb