public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Gleb Natapov <gleb@redhat.com>
To: qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org, blauwirbel@gmail.com, armbru@redhat.com,
	alex.williamson@redhat.com, mst@redhat.com
Subject: [PATCHv3 08/14] Add get_fw_dev_path callback for pci bus.
Date: Wed, 10 Nov 2010 19:14:15 +0200	[thread overview]
Message-ID: <1289409261-5418-9-git-send-email-gleb@redhat.com> (raw)
In-Reply-To: <1289409261-5418-1-git-send-email-gleb@redhat.com>


Signed-off-by: Gleb Natapov <gleb@redhat.com>
---
 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;
-- 
1.7.1


  parent reply	other threads:[~2010-11-10 17:14 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-10 17:14 [PATCHv3 00/14] boot order specification Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 01/14] Introduce fw_name field to DeviceInfo structure Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 02/14] Introduce new BusInfo callback get_fw_dev_path Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 03/14] Keep track of ISA ports ISA device is using in qdev Gleb Natapov
2010-11-11 10:14   ` Gerd Hoffmann
2010-11-11 10:22     ` Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 04/14] Add get_fw_dev_path callback to ISA bus " Gleb Natapov
2010-11-10 18:34   ` Blue Swirl
2010-11-10 17:14 ` [PATCHv3 05/14] Store IDE bus id in IDEBus structure for easy access Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 06/14] Add get_fw_dev_path callback to IDE bus Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 07/14] Add get_dev_path callback for system bus Gleb Natapov
2010-11-10 17:14 ` Gleb Natapov [this message]
2010-11-10 17:34   ` [PATCHv3 08/14] Add get_fw_dev_path callback for pci bus Michael S. Tsirkin
2010-11-10 18:02     ` Gleb Natapov
2010-11-10 18:21       ` Michael S. Tsirkin
2010-11-10 18:25         ` Blue Swirl
2010-11-10 18:33         ` Gleb Natapov
2010-11-11 10:07     ` Gerd Hoffmann
2010-11-11 10:17       ` Gleb Natapov
2010-11-11 11:00         ` Gerd Hoffmann
2010-11-11 15:05       ` Michael S. Tsirkin
2010-11-11 16:07         ` Gleb Natapov
2010-11-11 17:14           ` Michael S. Tsirkin
2010-11-10 17:14 ` [PATCHv3 09/14] Record which USBDevice USBPort belongs too Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 10/14] Add get_dev_path callback for usb bus Gleb Natapov
2010-11-10 18:37   ` Blue Swirl
2010-11-10 19:11     ` Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 11/14] Add bootindex parameter to net/block/fd device Gleb Natapov
2010-11-10 18:32   ` Blue Swirl
2010-11-10 18:48     ` Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 12/14] Add bootindex parameter to pci assigned device Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 13/14] Add notifier that will be called when machine is fully created Gleb Natapov
2010-11-10 17:14 ` [PATCHv3 14/14] Pass boot device list to firmware Gleb Natapov
2010-11-10 18:50   ` Blue Swirl
2010-11-10 19:11   ` Blue Swirl
2010-11-10 19:16     ` Gleb Natapov
2010-11-10 19:20       ` Blue Swirl
2010-11-11  7:03         ` Gleb Natapov
2010-11-10 18:08 ` [PATCHv3 00/14] boot order specification Blue Swirl
2010-11-10 18:19   ` Gleb Natapov
2010-11-11 10:21 ` Gerd Hoffmann
2010-11-11 18:41   ` Blue Swirl

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1289409261-5418-9-git-send-email-gleb@redhat.com \
    --to=gleb@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=armbru@redhat.com \
    --cc=blauwirbel@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox