From patchwork Wed Nov 10 17:14:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 70659 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 ozlabs.org (Postfix) with ESMTPS id 35186B70F9 for ; Thu, 11 Nov 2010 04:34:18 +1100 (EST) Received: from localhost ([127.0.0.1]:56188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGEYp-00020z-5M for incoming@patchwork.ozlabs.org; Wed, 10 Nov 2010 12:34:15 -0500 Received: from [140.186.70.92] (port=42555 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGEFh-00016g-L0 for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGEFe-0005Bm-TJ for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53679) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGEFe-0005AU-IU for qemu-devel@nongnu.org; Wed, 10 Nov 2010 12:14:26 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id oAAHEOkS023095 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 10 Nov 2010 12:14:24 -0500 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oAAHENdj023187; Wed, 10 Nov 2010 12:14:24 -0500 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id 25129133A09; Wed, 10 Nov 2010 19:14:22 +0200 (IST) From: Gleb Natapov To: qemu-devel@nongnu.org Date: Wed, 10 Nov 2010 19:14:15 +0200 Message-Id: <1289409261-5418-9-git-send-email-gleb@redhat.com> In-Reply-To: <1289409261-5418-1-git-send-email-gleb@redhat.com> References: <1289409261-5418-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: blauwirbel@gmail.com, alex.williamson@redhat.com, armbru@redhat.com, kvm@vger.kernel.org, mst@redhat.com Subject: [Qemu-devel] [PATCHv3 08/14] Add get_fw_dev_path callback for pci bus. 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: Gleb Natapov --- hw/pci.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 92aaa85..ab0399c 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -63,12 +63,14 @@ struct PCIBus { static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent); static char *pcibus_get_dev_path(DeviceState *dev); +static char *pcibus_get_fw_dev_path(DeviceState *dev); static struct BusInfo pci_bus_info = { .name = "PCI", .size = sizeof(PCIBus), .print_dev = pcibus_dev_print, .get_dev_path = pcibus_get_dev_path, + .get_fw_dev_path = pcibus_get_fw_dev_path, .props = (Property[]) { DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), DEFINE_PROP_STRING("romfile", PCIDevice, romfile), @@ -2135,6 +2137,58 @@ static void pcibus_dev_print(Monitor *mon, DeviceState *dev, int indent) } } +static char *pci_dev_fw_name(DeviceState *dev, char *buf, int len) +{ + PCIDevice *d = (PCIDevice *)dev; + const char *name = NULL; + +#define E(R, N) case R: name = N; break; + + /* names taken from pci binding for open firmware */ + switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) { + E(0x0001, "display"); E(0x0100, "scsi"); E(0x0101, "ide"); + E(0x0102, "fdc"); E(0x0103, "ipi"); E(0x0104, "raid"); + E(0x0200, "ethernet"); E(0x0201, "token-ring"); E(0x0202, "fddi"); + E(0x0203, "atm"); E(0x0300 ... 0x03ff, "display"); E(0x0400, "video"); + E(0x0401, "sound"); E(0x0500, "memory"); E(0x0501, "flash"); + E(0x0600, "host"); E(0x0601, "isa"); E(0x0602, "eisa"); + E(0x0603, "mca"); E(0x0604, "pci"); E(0x0605, "pcmcia"); + E(0x0606, "nubus"); E(0x0607, "cardbus"); E(0x0700, "serial"); + E(0x0701, "parallel"); E(0x0800, "interrupt-controller"); + E(0x0801, "dma-controller"); E(0x0802, "timer"); + E(0x0803, "rtc"); E(0x0900, "keyboard"); E(0x0901, "pen"); + E(0x0902, "mouse"); E(0x0a00 ... 0x0aff, "dock"); + E(0x0b00 ... 0x0bff, "cpu"); E(0x0c00, "fireware"); + E(0x0c01, "access-bus"); E(0x0c02, "ssa"); E(0x0c03, "usb"); + E(0x0c04, "fibre-channel"); + } +#undef E + + if (name) { + pstrcpy(buf, len, name); + } else { + snprintf(buf, len, "pci%04x,%04x", + pci_get_word(d->config + PCI_VENDOR_ID), + pci_get_word(d->config + PCI_DEVICE_ID)); + } + + return buf; +} + +static char *pcibus_get_fw_dev_path(DeviceState *dev) +{ + PCIDevice *d = (PCIDevice *)dev; + char path[50], name[33]; + int off; + + off = snprintf(path, sizeof(path), "%s@%x", + pci_dev_fw_name(dev, name, sizeof name), + PCI_SLOT(d->devfn)); + if (PCI_FUNC(d->devfn)) + snprintf(path + off, sizeof(path) + off, ",%x", PCI_FUNC(d->devfn)); + return strdup(path); +} + static char *pcibus_get_dev_path(DeviceState *dev) { PCIDevice *d = (PCIDevice *)dev;