From patchwork Sat Aug 29 14:09:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Blue Swirl X-Patchwork-Id: 32504 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 0D5EAB708C for ; Sun, 30 Aug 2009 00:13:15 +1000 (EST) Received: from localhost ([127.0.0.1]:58388 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MhOg1-0003PD-3G for incoming@patchwork.ozlabs.org; Sat, 29 Aug 2009 10:13:09 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MhOcc-0002Xm-Q4 for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:09:38 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MhOcX-0002W9-UZ for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:09:38 -0400 Received: from [199.232.76.173] (port=47305 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MhOcX-0002W5-RH for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:09:33 -0400 Received: from mail-ew0-f223.google.com ([209.85.219.223]:57826) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MhOcW-0003sC-VM for qemu-devel@nongnu.org; Sat, 29 Aug 2009 10:09:33 -0400 Received: by ewy23 with SMTP id 23so3203843ewy.8 for ; Sat, 29 Aug 2009 07:09:32 -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=KV69X+MlNI36PhmnsS8SF4QecyiBhc/SYKBlLAjqJfM=; b=XtPXYkMN5MeG8yUicBSGjiQ0XaA2GJaO4BHGvtBskYTiCB0Jei9KpcogxrLujmjG03 Fr4F6t2xHlBGPQxxGmY53Jbd3L9Hz7EljypkcyIqVyw84M+cXpL2j4VfHR6iQrWolQMI Y2G+IN8DulmK6N3dI3/Ekm9FdqMkS8OEqE4/c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:content-type; b=X6os+6aWAdgGPLFdQYOumedjhlUnaURbW40VAwSxxO8a1dxzLa3imN6AHKGIysz5bz MRUa6baR1Fg0q1Iwq4ML9MLCYxs5H9ra5+RqBtqRCRz4skeDbcppjruqtAJWaQ2SfwAH nIxF0PWghWSN1renatj/Vk4ZOmqZktO2GNxB8= MIME-Version: 1.0 Received: by 10.210.223.13 with SMTP id v13mr2737036ebg.65.1251554972150; Sat, 29 Aug 2009 07:09:32 -0700 (PDT) From: Blue Swirl Date: Sat, 29 Aug 2009 17:09:12 +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 3/5] PCI: use device info 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/pci.c | 46 +++++++++++++++++++++++----------------------- hw/pci.h | 2 -- monitor.c | 2 -- qemu-monitor.hx | 2 -- 4 files changed, 23 insertions(+), 29 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 41e99a9..93c9c62 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -100,6 +100,8 @@ static void pci_bus_reset(void *opaque) } } +static void pci_info(Monitor *mon, void *opaque); + PCIBus *pci_register_bus(DeviceState *parent, const char *name, pci_set_irq_fn set_irq, pci_map_irq_fn map_irq, qemu_irq *pic, int devfn_min, int nirq) @@ -118,6 +120,7 @@ PCIBus *pci_register_bus(DeviceState *parent, const char *name, first_bus = bus; vmstate_register(nbus++, &vmstate_pcibus, bus); qemu_register_reset(pci_bus_reset, bus); + monitor_register_device_info(name, pci_info, bus); return bus; } @@ -695,9 +698,24 @@ static const pci_class_desc pci_class_descriptions[] = { 0, NULL} }; -static void pci_info_device(PCIDevice *d) +static void pci_bus_for_each_device(PCIBus *bus, + void (*fn)(PCIDevice *d, void *fn_opaque), + void *fn_opaque) { - Monitor *mon = cur_mon; + PCIDevice *d; + int devfn; + + for(devfn = 0; devfn < 256; devfn++) { + d = bus->devices[devfn]; + if (d) { + fn(d, fn_opaque); + } + } +} + +static void pci_info_device(PCIDevice *d, void *opaque) +{ + Monitor *mon = opaque; int i, class; PCIIORegion *r; const pci_class_desc *desc; @@ -739,31 +757,13 @@ static void pci_info_device(PCIDevice *d) } } monitor_printf(mon, " id \"%s\"\n", d->qdev.id ? d->qdev.id : ""); - if (class == 0x0604 && d->config[0x19] != 0) { - pci_for_each_device(d->config[0x19], pci_info_device); - } } -void pci_for_each_device(int bus_num, void (*fn)(PCIDevice *d)) +static void pci_info(Monitor *mon, void *opaque) { - PCIBus *bus = first_bus; - PCIDevice *d; - int devfn; - - while (bus && bus->bus_num != bus_num) - bus = bus->next; - if (bus) { - for(devfn = 0; devfn < 256; devfn++) { - d = bus->devices[devfn]; - if (d) - fn(d); - } - } -} + PCIBus *bus = opaque; -void pci_info(Monitor *mon) -{ - pci_for_each_device(0, pci_info_device); + pci_bus_for_each_device(bus, pci_info_device, mon); } PCIDevice *pci_create(const char *name, const char *devaddr) diff --git a/hw/pci.h b/hw/pci.h index fd1d35c..a3e7ba9 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -250,14 +250,12 @@ PCIDevice *pci_nic_init(NICInfo *nd, const char *default_model, void pci_data_write(void *opaque, uint32_t addr, uint32_t val, int len); uint32_t pci_data_read(void *opaque, uint32_t addr, int len); int pci_bus_num(PCIBus *s); -void pci_for_each_device(int bus_num, void (*fn)(PCIDevice *d)); PCIBus *pci_find_bus(int bus_num); PCIDevice *pci_find_device(int bus_num, int slot, int function); int pci_read_devaddr(Monitor *mon, const char *addr, int *domp, int *busp, unsigned *slotp); -void pci_info(Monitor *mon); PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, pci_map_irq_fn map_irq, const char *name); diff --git a/monitor.c b/monitor.c index d5b39eb..4f507f2 100644 --- a/monitor.c +++ b/monitor.c @@ -1799,8 +1799,6 @@ static const mon_cmd_t info_cmds[] = { "", "show infos for each CPU" }, { "history", "", do_info_history, "", "show the command line history", }, - { "pci", "", pci_info, - "", "show PCI info", }, #if defined(TARGET_I386) || defined(TARGET_SH4) { "tlb", "", tlb_info, "", "show virtual to physical memory mappings", }, diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 2026921..6ad960e 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -45,8 +45,6 @@ show the cpu registers show infos for each CPU @item info history show the command line history -@item info pci -show emulated PCI device info @item info tlb show virtual to physical memory mappings (i386 only) @item info mem