[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 16/39] pci: Convert uses of pci_create() etc. manually
From: |
Markus Armbruster |
Subject: |
[PATCH v3 16/39] pci: Convert uses of pci_create() etc. manually |
Date: |
Tue, 9 Jun 2020 18:39:09 +0200 |
Same transformation as in the previous commit. Manual, because
convincing Coccinelle to transform these cases is not worthwhile.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/sparc64/sun4u.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 6f29a013ca..0b898d6e3d 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -635,24 +635,28 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
memset(&macaddr, 0, sizeof(MACAddr));
onboard_nic = false;
for (i = 0; i < nb_nics; i++) {
+ PCIBus *bus;
nd = &nd_table[i];
if (!nd->model || strcmp(nd->model, "sunhme") == 0) {
if (!onboard_nic) {
- pci_dev = pci_create_multifunction(pci_busA, PCI_DEVFN(1, 1),
+ pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1),
true, "sunhme");
+ bus = pci_busA;
memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr));
onboard_nic = true;
} else {
- pci_dev = pci_create(pci_busB, -1, "sunhme");
+ pci_dev = pci_new(-1, "sunhme");
+ bus = pci_busB;
}
} else {
- pci_dev = pci_create(pci_busB, -1, nd->model);
+ pci_dev = pci_new(-1, nd->model);
+ bus = pci_busB;
}
dev = &pci_dev->qdev;
qdev_set_nic_properties(dev, nd);
- qdev_init_nofail(dev);
+ pci_realize_and_unref(pci_dev, bus, &error_fatal);
}
/* If we don't have an onboard NIC, grab a default MAC address so that
--
2.26.2
- [PATCH v3 00/39] qdev: Rework how we plug into the parent bus, Markus Armbruster, 2020/06/09
- [PATCH v3 05/39] qdev: Put qdev_new() to use with Coccinelle, Markus Armbruster, 2020/06/09
- [PATCH v3 01/39] qdev: Rename qbus_realize() to qbus_init(), Markus Armbruster, 2020/06/09
- [PATCH v3 03/39] Revert "hw/versatile: realize the PCI root bus as part of the versatile init", Markus Armbruster, 2020/06/09
- [PATCH v3 07/39] qdev: Convert to qdev_unrealize() with Coccinelle, Markus Armbruster, 2020/06/09
- [PATCH v3 10/39] qdev: Convert uses of qdev_create() manually, Markus Armbruster, 2020/06/09
- [PATCH v3 06/39] qdev: Convert to qbus_realize(), qbus_unrealize(), Markus Armbruster, 2020/06/09
- [PATCH v3 14/39] hw/ppc: Eliminate two superfluous QOM casts, Markus Armbruster, 2020/06/09
- [PATCH v3 16/39] pci: Convert uses of pci_create() etc. manually,
Markus Armbruster <=
- [PATCH v3 21/39] isa: isa_create(), isa_try_create() are now unused, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 24/39] ssi: Convert last use of ssi_create_slave_no_init() manually, Markus Armbruster, 2020/06/09
- [PATCH v3 18/39] isa: New isa_new(), isa_realize_and_unref() etc., Markus Armbruster, 2020/06/09
- [PATCH v3 30/39] qdev: qdev_create(), qdev_try_create() are now unused, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 25/39] ssi: ssi_create_slave_no_init() is now unused, drop, Markus Armbruster, 2020/06/09
- [PATCH v3 19/39] isa: Convert uses of isa_create() with Coccinelle, Markus Armbruster, 2020/06/09
- [PATCH v3 15/39] pci: Convert uses of pci_create() etc. with Coccinelle, Markus Armbruster, 2020/06/09
- [PATCH v3 23/39] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle, Markus Armbruster, 2020/06/09
- [PATCH v3 08/39] qdev: Convert to qdev_unrealize() manually, Markus Armbruster, 2020/06/09
- [PATCH v3 12/39] qdev: Convert uses of qdev_set_parent_bus() manually, Markus Armbruster, 2020/06/09