From 4c0ea64b267879334d75cb39ea60abd43b92e148 Mon Sep 17 00:00:00 2001
From: Matt Borgerson <contact@mborgerson.com>
Date: Tue, 25 Aug 2020 14:41:16 -0700
Subject: [PATCH] xbox: Convert pci_create/qdev_init_nofail to
pci_new/pci_realize_and_unref
See "pci: New pci_new(), pci_realize_and_unref() etc." for more info.
---
hw/xbox/xbox.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/xbox/xbox.c b/hw/xbox/xbox.c
index 0933dcf8a0..8b96a50c38 100644
--- a/hw/xbox/xbox.c
+++ b/hw/xbox/xbox.c
@@ -403,22 +403,22 @@ void xbox_init_common(MachineState *machine,
smbus_adm1032_init(smbus, 0x4c);
/* USB */
- PCIDevice *usb1 = pci_create(pci_bus, PCI_DEVFN(3, 0), "pci-ohci");
+ PCIDevice *usb1 = pci_new(PCI_DEVFN(3, 0), "pci-ohci");
qdev_prop_set_uint32(&usb1->qdev, "num-ports", 4);
- qdev_init_nofail(&usb1->qdev);
+ pci_realize_and_unref(usb1, pci_bus, &error_fatal);
- PCIDevice *usb0 = pci_create(pci_bus, PCI_DEVFN(2, 0), "pci-ohci");
+ PCIDevice *usb0 = pci_new(PCI_DEVFN(2, 0), "pci-ohci");
qdev_prop_set_uint32(&usb0->qdev, "num-ports", 4);
- qdev_init_nofail(&usb0->qdev);
+ pci_realize_and_unref(usb0, pci_bus, &error_fatal);
/* Ethernet! */
- PCIDevice *nvnet = pci_create(pci_bus, PCI_DEVFN(4, 0), "nvnet");
+ PCIDevice *nvnet = pci_new(PCI_DEVFN(4, 0), "nvnet");
for (i = 0; i < nb_nics; i++) {
NICInfo *nd = &nd_table[i];
qemu_check_nic_model(nd, "nvnet");
qdev_set_nic_properties(&nvnet->qdev, nd);
- qdev_init_nofail(&nvnet->qdev);
+ pci_realize_and_unref(nvnet, pci_bus, &error_fatal);
}
/* APU! */