[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] replace duplicated code.
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH] replace duplicated code. |
Date: |
Wed, 17 Jun 2009 18:52:09 -0400 |
pci_register_simple() does exactly the same of great part of the code
in pci nic initialization. Replace it.
Signed-off-by: Glauber Costa <address@hidden>
---
hw/pci.c | 12 ++++--------
hw/qdev.c | 1 +
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/hw/pci.c b/hw/pci.c
index baffadd..0169b78 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -818,20 +818,16 @@ static const char * const pci_nic_names[] = {
PCIDevice *pci_nic_init(PCIBus *bus, NICInfo *nd, int devfn,
const char *default_model)
{
- DeviceState *dev;
int i;
qemu_check_nic_model_list(nd, pci_nic_models, default_model);
for (i = 0; pci_nic_models[i]; i++) {
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;
- return (PCIDevice *)dev;
+ PCIDevice *d;
+ d = pci_create_simple(bus, devfn, pci_nic_names[i]);
+ qdev_set_netdev((DeviceState *)d, nd);
+ return d;
}
}
diff --git a/hw/qdev.c b/hw/qdev.c
index 5175fe1..c7446d5 100644
--- a/hw/qdev.c
+++ b/hw/qdev.c
@@ -164,6 +164,7 @@ void qdev_set_netdev(DeviceState *dev, NICInfo *nd)
{
assert(!dev->nd);
dev->nd = nd;
+ nd->private = dev;
}
--
1.6.2.2
- [Qemu-devel] [PATCH] replace duplicated code.,
Glauber Costa <=