[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv8 08/16] Add get_fw_dev_path callback for pci bus.
From: |
Gleb Natapov |
Subject: |
[Qemu-devel] [PATCHv8 08/16] Add get_fw_dev_path callback for pci bus. |
Date: |
Wed, 8 Dec 2010 13:35:01 +0200 |
Signed-off-by: Gleb Natapov <address@hidden>
---
hw/pci.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 23 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 0c15b13..e7ea907 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -43,6 +43,7 @@
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 int pcibus_reset(BusState *qbus);
struct BusInfo pci_bus_info = {
@@ -50,6 +51,7 @@ struct BusInfo pci_bus_info = {
.size = sizeof(PCIBus),
.print_dev = pcibus_dev_print,
.get_dev_path = pcibus_get_dev_path,
+ .get_fw_dev_path = pcibus_get_fw_dev_path,
.reset = pcibus_reset,
.props = (Property[]) {
DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1),
@@ -1117,45 +1119,63 @@ void pci_msi_notify(PCIDevice *dev, unsigned int vector)
typedef struct {
uint16_t class;
const char *desc;
+ const char *fw_name;
+ uint16_t fw_ign_bits;
} pci_class_desc;
static const pci_class_desc pci_class_descriptions[] =
{
- { 0x0100, "SCSI controller"},
- { 0x0101, "IDE controller"},
- { 0x0102, "Floppy controller"},
- { 0x0103, "IPI controller"},
- { 0x0104, "RAID controller"},
+ { 0x0001, "VGA controller", "display"},
+ { 0x0100, "SCSI controller", "scsi"},
+ { 0x0101, "IDE controller", "ide"},
+ { 0x0102, "Floppy controller", "fdc"},
+ { 0x0103, "IPI controller", "ipi"},
+ { 0x0104, "RAID controller", "raid"},
{ 0x0106, "SATA controller"},
{ 0x0107, "SAS controller"},
{ 0x0180, "Storage controller"},
- { 0x0200, "Ethernet controller"},
- { 0x0201, "Token Ring controller"},
- { 0x0202, "FDDI controller"},
- { 0x0203, "ATM controller"},
+ { 0x0200, "Ethernet controller", "ethernet"},
+ { 0x0201, "Token Ring controller", "token-ring"},
+ { 0x0202, "FDDI controller", "fddi"},
+ { 0x0203, "ATM controller", "atm"},
{ 0x0280, "Network controller"},
- { 0x0300, "VGA controller"},
+ { 0x0300, "VGA controller", "display", 0x00ff},
{ 0x0301, "XGA controller"},
{ 0x0302, "3D controller"},
{ 0x0380, "Display controller"},
- { 0x0400, "Video controller"},
- { 0x0401, "Audio controller"},
+ { 0x0400, "Video controller", "video"},
+ { 0x0401, "Audio controller", "sound"},
{ 0x0402, "Phone"},
{ 0x0480, "Multimedia controller"},
- { 0x0500, "RAM controller"},
- { 0x0501, "Flash controller"},
+ { 0x0500, "RAM controller", "memory"},
+ { 0x0501, "Flash controller", "flash"},
{ 0x0580, "Memory controller"},
- { 0x0600, "Host bridge"},
- { 0x0601, "ISA bridge"},
- { 0x0602, "EISA bridge"},
- { 0x0603, "MC bridge"},
- { 0x0604, "PCI bridge"},
- { 0x0605, "PCMCIA bridge"},
- { 0x0606, "NUBUS bridge"},
- { 0x0607, "CARDBUS bridge"},
+ { 0x0600, "Host bridge", "host"},
+ { 0x0601, "ISA bridge", "isa"},
+ { 0x0602, "EISA bridge", "eisa"},
+ { 0x0603, "MC bridge", "mca"},
+ { 0x0604, "PCI bridge", "pci"},
+ { 0x0605, "PCMCIA bridge", "pcmcia"},
+ { 0x0606, "NUBUS bridge", "nubus"},
+ { 0x0607, "CARDBUS bridge", "cardbus"},
{ 0x0608, "RACEWAY bridge"},
{ 0x0680, "Bridge"},
- { 0x0c03, "USB controller"},
+ { 0x0700, "Serial port", "serial"},
+ { 0x0701, "Parallel port", "parallel"},
+ { 0x0800, "Interrupt controller", "interrupt-controller"},
+ { 0x0801, "DMA controller", "dma-controller"},
+ { 0x0802, "Timer", "timer"},
+ { 0x0803, "RTC", "rtc"},
+ { 0x0900, "Keyboard", "keyboard"},
+ { 0x0901, "Pen", "pen"},
+ { 0x0902, "Mouse", "mouse"},
+ { 0x0A00, "Dock station", "dock", 0x00ff},
+ { 0x0B00, "i386 cpu", "cpu", 0x00ff},
+ { 0x0c00, "Fireware contorller", "fireware"},
+ { 0x0c01, "Access bus controller", "access-bus"},
+ { 0x0c02, "SSA controller", "ssa"},
+ { 0x0c03, "USB controller", "usb"},
+ { 0x0c04, "Fibre channel controller", "fibre-channel"},
{ 0, NULL}
};
@@ -1960,6 +1980,48 @@ 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;
+ const pci_class_desc *desc = pci_class_descriptions;
+ int class = pci_get_word(d->config + PCI_CLASS_DEVICE);
+
+ while (desc->desc &&
+ (class & ~desc->fw_ign_bits) !=
+ (desc->class & ~desc->fw_ign_bits)) {
+ desc++;
+ }
+
+ if (desc->desc) {
+ name = desc->fw_name;
+ }
+
+ 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), "address@hidden",
+ 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.2.3
- [Qemu-devel] [PATCHv8 00/16] boot order specification, Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 02/16] Introduce new BusInfo callback get_fw_dev_path., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 15/16] Add notifier that will be called when machine is fully created., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 03/16] Keep track of ISA ports ISA device is using in qdev., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 05/16] Store IDE bus id in IDEBus structure for easy access., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 14/16] Add bootindex for option roms., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 16/16] Pass boot device list to firmware., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 09/16] Record which USBDevice USBPort belongs too., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 08/16] Add get_fw_dev_path callback for pci bus.,
Gleb Natapov <=
- [Qemu-devel] [PATCHv8 11/16] Add get_fw_dev_path callback to scsi bus., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 04/16] Add get_fw_dev_path callback to ISA bus in qdev., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 12/16] Add bootindex parameter to net/block/fd device, Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 07/16] Add get_fw_dev_path callback for system bus., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 06/16] Add get_fw_dev_path callback to IDE bus., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 13/16] Change fw_cfg_add_file() to get full file path as a parameter., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 10/16] Add get_fw_dev_path callback for usb bus., Gleb Natapov, 2010/12/08
- [Qemu-devel] [PATCHv8 01/16] Introduce fw_name field to DeviceInfo structure., Gleb Natapov, 2010/12/08
- [Qemu-devel] Re: [PATCHv8 00/16] boot order specification, Blue Swirl, 2010/12/11