SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pci: Convert pci_nic_init() to Error to avoid qdev_init()

Browse Source 
qdev_init() is deprecated, and will be removed when its callers have
been weaned off it.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Markus Armbruster 2015-02-27 15:40:25 +01:00 committed by Michael S. Tsirkin
parent 75cc7f0183
commit 558ecef292
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/pci/pci.c
View File

@ -1613,9 +1613,11 @@ static const char * const pci_nic_names[] = {
/* Initialize a PCI NIC. */ /* Initialize a PCI NIC. */
static PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus, static PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus,
const char *default_model, const char *default_model,
const char *default_devaddr) const char *default_devaddr,
Error **errp)
{ {
const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr; const char *devaddr = nd->devaddr ? nd->devaddr : default_devaddr;
Error *err = NULL;
PCIBus *bus; PCIBus *bus;
int devfn; int devfn;
PCIDevice *pci_dev; PCIDevice *pci_dev;
@ -1636,8 +1638,13 @@ static PCIDevice *pci_nic_init(NICInfo *nd, PCIBus *rootbus,
pci_dev = pci_create(bus, devfn, pci_nic_names[i]); pci_dev = pci_create(bus, devfn, pci_nic_names[i]);
dev = &pci_dev->qdev; dev = &pci_dev->qdev;
qdev_set_nic_properties(dev, nd); qdev_set_nic_properties(dev, nd);
if (qdev_init(dev) < 0)
object_property_set_bool(OBJECT(dev), true, "realized", &err);
if (err) {
error_propagate(errp, err);
object_unparent(OBJECT(dev));
return NULL; return NULL;
}
return pci_dev; return pci_dev;
} }
@ -1645,14 +1652,17 @@ PCIDevice *pci_nic_init_nofail(NICInfo *nd, PCIBus *rootbus,
const char *default_model, const char *default_model,
const char *default_devaddr) const char *default_devaddr)
{ {
Error *err = NULL;
PCIDevice *res; PCIDevice *res;
if (qemu_show_nic_models(nd->model, pci_nic_models)) if (qemu_show_nic_models(nd->model, pci_nic_models))
exit(0); exit(0);
res = pci_nic_init(nd, rootbus, default_model, default_devaddr); res = pci_nic_init(nd, rootbus, default_model, default_devaddr, &err);
if (!res) if (!res) {
error_report_err(err);
exit(1); exit(1);
}
return res; return res;
} }