[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH RESEND v3 16/58] pci: Convert uses of pci_create() etc. manually
From: |
Markus Armbruster |
Subject: |
[PATCH RESEND v3 16/58] pci: Convert uses of pci_create() etc. manually |
Date: |
Wed, 10 Jun 2020 07:32:05 +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 RESEND v3 31/58] auxbus: Rename aux_init_bus() to aux_bus_init(), (continued)
- [PATCH RESEND v3 31/58] auxbus: Rename aux_init_bus() to aux_bus_init(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 23/58] ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 04/58] qdev: New qdev_new(), qdev_realize(), etc., Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 52/58] microbit: Eliminate two local variables in microbit_init(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 58/58] MAINTAINERS: Make section QOM cover hw/core/*bus.c as well, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 57/58] qdev: qdev_init_nofail() is now unused, drop, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 36/58] qom: Less verbose object_initialize_child(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 27/58] usb: Convert uses of usb_create(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 16/58] pci: Convert uses of pci_create() etc. manually,
Markus Armbruster <=
- [PATCH RESEND v3 55/58] qdev: Use qdev_realize() in qdev_device_add(), Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 47/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 1, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 53/58] s390x/event-facility: Simplify creation of SCLP event devices, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 49/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 3, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 56/58] qdev: Convert bus-less devices to qdev_realize() with Coccinelle, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 48/58] sysbus: Convert qdev_set_parent_bus() use with Coccinelle, part 2, Markus Armbruster, 2020/06/10
- [PATCH RESEND v3 45/58] sysbus: Convert to sysbus_realize() etc. with Coccinelle, Markus Armbruster, 2020/06/10
- Re: [PATCH RESEND v3 00/58] qdev: Rework how we plug into the parent bus, Michael S. Tsirkin, 2020/06/10