Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LW2Se-0002L3-Hu for qemu-devel@nongnu.org; Sun, 08 Feb 2009 00:44:08 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LW2Sc-0002KJ-Lw for qemu-devel@nongnu.org; Sun, 08 Feb 2009 00:44:07 -0500 Received: from [199.232.76.173] (port=51389 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LW2Sc-0002Jy-9u for qemu-devel@nongnu.org; Sun, 08 Feb 2009 00:44:06 -0500 Received: from mx2.redhat.com ([66.187.237.31]:54266) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LW2Sb-0006kk-M8 for qemu-devel@nongnu.org; Sun, 08 Feb 2009 00:44:06 -0500 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n185i5Tm026434 for ; Sun, 8 Feb 2009 00:44:05 -0500 Message-Id: <20090206174840.505473181@amt.cnet> Date: Fri, 06 Feb 2009 15:44:07 -0200 From: Marcelo Tosatti References: <20090206174406.589893548@amt.cnet> Content-Disposition: inline; filename=pci-helper-parser Subject: [Qemu-devel] [patch 1/2] pci device registration helpers Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti This code parses full PCI device addresses. It then rejects domains other than zero, because these are not supported in QEMU. From: Markus Armbruster Signed-off-by: Marcelo Tosatti Index: trunk/hw/pci.c =================================================================== --- trunk.orig/hw/pci.c +++ trunk/hw/pci.c @@ -26,6 +26,7 @@ #include "console.h" #include "net.h" #include "virtio-net.h" +#include "sysemu.h" //#define DEBUG_PCI @@ -158,6 +159,89 @@ static int pci_set_default_subsystem_id( return 0; } +/* + * Parse [[:]:], return -1 on error + */ +static int pci_parse_devaddr(const char *addr, int *domp, int *busp, unsigned *slotp) +{ + const char *p; + char *e; + unsigned long val; + unsigned long dom = 0, bus = 0; + unsigned slot = 0; + + p = addr; + val = strtoul(p, &e, 16); + if (e == p) + return -1; + if (*e == ':') { + bus = val; + p = e + 1; + val = strtoul(p, &e, 16); + if (e == p) + return -1; + if (*e == ':') { + dom = bus; + bus = val; + p = e + 1; + val = strtoul(p, &e, 16); + if (e == p) + return -1; + } + } + + if (dom > 0xffff || bus > 0xff || val > 0x1f) { + fprintf(stderr, "PCI device address %s out of range", addr); + return -1; + } + slot = val; + + if (*e) + return -1; + + /* Note: QEMU doesn't implement domains other than 0 */ + if (dom != 0 || pci_find_bus(bus) == NULL) { + fprintf(stderr, "PCI device address %s not supported", addr); + return -1; + } + + *domp = dom; + *busp = bus; + *slotp = slot; + return 0; +} + +int pci_read_devaddr(const char *addr, int *domp, int *busp, unsigned *slotp) +{ + char devaddr[32]; + + if (!get_param_value(devaddr, sizeof(devaddr), "pci_addr", addr)) { + term_printf("Missing pci_addr=\n"); + return -1; + } + + return pci_parse_devaddr(devaddr, domp, busp, slotp); +} + +int pci_assign_devaddr(const char *addr, int *domp, int *busp, unsigned *slotp) +{ + char devaddr[32]; + + if (!get_param_value(devaddr, sizeof(devaddr), "pci_addr", addr)) { + term_printf("Missing pci_addr=\n"); + return -1; + } + + if (!strcmp(devaddr, "auto")) { + *domp = *busp = 0; + *slotp = -1; + /* want to support dom/bus auto-assign at some point */ + return 0; + } + + return pci_parse_devaddr(devaddr, domp, busp, slotp); +} + /* -1 for devfn means auto assign */ PCIDevice *pci_register_device(PCIBus *bus, const char *name, int instance_size, int devfn, Index: trunk/hw/pci.h =================================================================== --- trunk.orig/hw/pci.h +++ trunk/hw/pci.h @@ -232,6 +232,9 @@ void pci_for_each_device(int bus_num, vo PCIBus *pci_find_bus(int bus_num); PCIDevice *pci_find_device(int bus_num, int slot, int function); +int pci_read_devaddr(const char *addr, int *domp, int *busp, unsigned *slotp); +int pci_assign_devaddr(const char *addr, int *domp, int *busp, unsigned *slotp); + void pci_info(void); PCIBus *pci_bridge_init(PCIBus *bus, int devfn, uint16_t vid, uint16_t did, pci_map_irq_fn map_irq, const char *name);