[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 16/58] pci: Convert uses of pci_create() etc. manually
From: |
Markus Armbruster |
Subject: |
[PATCH v2 16/58] pci: Convert uses of pci_create() etc. manually |
Date: |
Fri, 29 May 2020 15:44:41 +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>
---
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.21.3
- [PATCH v2 39/58] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls, (continued)
- [PATCH v2 39/58] sysbus: Drop useless OBJECT() in sysbus_init_child_obj() calls, Markus Armbruster, 2020/05/29
- [PATCH v2 40/58] microbit: Tidy up sysbus_init_child_obj() @child argument, Markus Armbruster, 2020/05/29
- [PATCH v2 17/58] pci: pci_create(), pci_create_multifunction() are now unused, drop, Markus Armbruster, 2020/05/29
- [PATCH v2 24/58] ssi: Convert last use of ssi_create_slave_no_init() manually, Markus Armbruster, 2020/05/29
- [PATCH v2 46/58] qdev: Drop qdev_realize() support for null bus, Markus Armbruster, 2020/05/29
- [PATCH v2 23/58] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 52/58] microbit: Eliminate two local variables in microbit_init(), Markus Armbruster, 2020/05/29
- [PATCH v2 51/58] sysbus: sysbus_init_child_obj() is now unused, drop, Markus Armbruster, 2020/05/29
- [PATCH v2 27/58] usb: Convert uses of usb_create(), Markus Armbruster, 2020/05/29
- [PATCH v2 28/58] usb: usb_create() is now unused, drop, Markus Armbruster, 2020/05/29
- [PATCH v2 16/58] pci: Convert uses of pci_create() etc. manually,
Markus Armbruster <=
- [PATCH v2 58/58] MAINTAINERS: Make section QOM cover hw/core/*bus.c as well, Markus Armbruster, 2020/05/29
- [PATCH v2 20/58] isa: Convert uses of isa_create(), isa_try_create() manually, Markus Armbruster, 2020/05/29
- [PATCH v2 13/58] pci: New pci_new(), pci_realize_and_unref() etc., Markus Armbruster, 2020/05/29
- [PATCH v2 36/58] qom: Less verbose object_initialize_child(), Markus Armbruster, 2020/05/29
- [PATCH v2 44/58] sysbus: New sysbus_realize(), sysbus_realize_and_unref(), Markus Armbruster, 2020/05/29
- [PATCH v2 09/58] qdev: Convert uses of qdev_create() with Coccinelle, Markus Armbruster, 2020/05/29
- [PATCH v2 26/58] usb: New usb_new(), usb_realize_and_unref(), Markus Armbruster, 2020/05/29
- [PATCH v2 50/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 4, Markus Armbruster, 2020/05/29
- [PATCH v2 54/58] qdev: Make qdev_realize() support bus-less devices, Markus Armbruster, 2020/05/29