[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] allow for name property in pci devices.
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH] allow for name property in pci devices. |
Date: |
Wed, 17 Jun 2009 09:13:00 -0400 |
not all devices should be called "FIXME".
Signed-off-by: Glauber Costa <address@hidden>
---
hw/pci.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index 0ab5b94..baffadd 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -827,6 +827,7 @@ PCIDevice *pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn,
if (strcmp(nd->model, pci_nic_models[i]) == 0) {
dev = qdev_create(&bus->qbus, pci_nic_names[i]);
qdev_set_prop_int(dev, "devfn", devfn);
+ qdev_set_prop_ptr(dev, "name", (void *)pci_nic_names[i]);
qdev_set_netdev(dev, nd);
qdev_init(dev);
nd->private = dev;
@@ -916,10 +917,13 @@ static void pci_qdev_init(DeviceState *qdev, DeviceInfo
*base)
PCIDeviceInfo *info = container_of(base, PCIDeviceInfo, qdev);
PCIBus *bus;
int devfn;
+ void *name;
bus = FROM_QBUS(PCIBus, qdev_get_parent_bus(qdev));
devfn = qdev_get_prop_int(qdev, "devfn", -1);
- pci_dev = do_pci_register_device(pci_dev, bus, "FIXME", devfn,
+ name = qdev_get_prop_ptr(qdev, "name");
+
+ pci_dev = do_pci_register_device(pci_dev, bus, name, devfn,
NULL, NULL);//FIXME:config_read,
config_write);
assert(pci_dev);
info->init(pci_dev);
@@ -943,6 +947,7 @@ PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const
char *name)
dev = qdev_create(&bus->qbus, name);
qdev_set_prop_int(dev, "devfn", devfn);
+ qdev_set_prop_ptr(dev, "name", (void *)name);
qdev_init(dev);
return (PCIDevice *)dev;
--
1.6.2.2
- [Qemu-devel] [PATCH] allow for name property in pci devices.,
Glauber Costa <=