[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 35/66] hw/pci/pci: Remove multifunction parameter from pci_new_mul
From: |
Michael S. Tsirkin |
Subject: |
[PULL 35/66] hw/pci/pci: Remove multifunction parameter from pci_new_multifunction() |
Date: |
Mon, 10 Jul 2023 19:04:06 -0400 |
From: Bernhard Beschow <shentey@gmail.com>
There is also pci_new() which creates non-multifunction PCI devices.
Accordingly the parameter is always set to true when a multi function PCI
device is to be created.
The reason for the parameter's existence seems to be that it is used in the
internal PCI code as well which is the only location where it gets set to
false. This one usage can be resolved by factoring out an internal helper
function.
Remove this redundant, error-prone parameter.
Signed-off-by: Bernhard Beschow <shentey@gmail.com>
Message-Id: <20230304114043.121024-6-shentey@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/pci/pci.h | 3 +--
hw/i386/pc_q35.c | 6 +++---
hw/pci-host/sabre.c | 6 ++----
hw/pci/pci.c | 13 +++++++++----
hw/sparc64/sun4u.c | 5 ++---
5 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 18c35b64db..ab2bd65a3a 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -577,8 +577,7 @@ pci_set_quad_by_mask(uint8_t *config, uint64_t mask,
uint64_t reg)
pci_set_quad(config, (~mask & val) | (mask & rval));
}
-PCIDevice *pci_new_multifunction(int devfn, bool multifunction,
- const char *name);
+PCIDevice *pci_new_multifunction(int devfn, const char *name);
PCIDevice *pci_new(int devfn, const char *name);
bool pci_realize_and_unref(PCIDevice *dev, PCIBus *bus, Error **errp);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index fdab1f6a56..dc27a9e223 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -100,12 +100,12 @@ static int ehci_create_ich9_with_companions(PCIBus *bus,
int slot)
return -1;
}
- ehci = pci_new_multifunction(PCI_DEVFN(slot, 7), true, name);
+ ehci = pci_new_multifunction(PCI_DEVFN(slot, 7), name);
pci_realize_and_unref(ehci, bus, &error_fatal);
usbbus = QLIST_FIRST(&ehci->qdev.child_bus);
for (i = 0; i < 3; i++) {
- uhci = pci_new_multifunction(PCI_DEVFN(slot, comp[i].func), true,
+ uhci = pci_new_multifunction(PCI_DEVFN(slot, comp[i].func),
comp[i].name);
qdev_prop_set_string(&uhci->qdev, "masterbus", usbbus->name);
qdev_prop_set_uint32(&uhci->qdev, "firstport", comp[i].port);
@@ -239,7 +239,7 @@ static void pc_q35_init(MachineState *machine)
pcms->bus = host_bus;
/* create ISA bus */
- lpc = pci_new_multifunction(PCI_DEVFN(ICH9_LPC_DEV, ICH9_LPC_FUNC), true,
+ lpc = pci_new_multifunction(PCI_DEVFN(ICH9_LPC_DEV, ICH9_LPC_FUNC),
TYPE_ICH9_LPC_DEVICE);
qdev_prop_set_bit(DEVICE(lpc), "smm-enabled",
x86_machine_is_smm_enabled(x86ms));
diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index 949ecc21f2..dcb2e230b6 100644
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -387,14 +387,12 @@ static void sabre_realize(DeviceState *dev, Error **errp)
pci_setup_iommu(phb->bus, sabre_pci_dma_iommu, s->iommu);
/* APB secondary busses */
- pci_dev = pci_new_multifunction(PCI_DEVFN(1, 0), true,
- TYPE_SIMBA_PCI_BRIDGE);
+ pci_dev = pci_new_multifunction(PCI_DEVFN(1, 0), TYPE_SIMBA_PCI_BRIDGE);
s->bridgeB = PCI_BRIDGE(pci_dev);
pci_bridge_map_irq(s->bridgeB, "pciB", pci_simbaB_map_irq);
pci_realize_and_unref(pci_dev, phb->bus, &error_fatal);
- pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1), true,
- TYPE_SIMBA_PCI_BRIDGE);
+ pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1), TYPE_SIMBA_PCI_BRIDGE);
s->bridgeA = PCI_BRIDGE(pci_dev);
pci_bridge_map_irq(s->bridgeA, "pciA", pci_simbaA_map_irq);
pci_realize_and_unref(pci_dev, phb->bus, &error_fatal);
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 5152989c10..fb17138f7d 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2164,8 +2164,8 @@ static void pci_qdev_realize(DeviceState *qdev, Error
**errp)
pci_dev->msi_trigger = pci_msi_trigger;
}
-PCIDevice *pci_new_multifunction(int devfn, bool multifunction,
- const char *name)
+static PCIDevice *pci_new_internal(int devfn, bool multifunction,
+ const char *name)
{
DeviceState *dev;
@@ -2175,9 +2175,14 @@ PCIDevice *pci_new_multifunction(int devfn, bool
multifunction,
return PCI_DEVICE(dev);
}
+PCIDevice *pci_new_multifunction(int devfn, const char *name)
+{
+ return pci_new_internal(devfn, true, name);
+}
+
PCIDevice *pci_new(int devfn, const char *name)
{
- return pci_new_multifunction(devfn, false, name);
+ return pci_new_internal(devfn, false, name);
}
bool pci_realize_and_unref(PCIDevice *dev, PCIBus *bus, Error **errp)
@@ -2188,7 +2193,7 @@ bool pci_realize_and_unref(PCIDevice *dev, PCIBus *bus,
Error **errp)
PCIDevice *pci_create_simple_multifunction(PCIBus *bus, int devfn,
const char *name)
{
- PCIDevice *dev = pci_new_multifunction(devfn, true, name);
+ PCIDevice *dev = pci_new_multifunction(devfn, name);
pci_realize_and_unref(dev, bus, &error_fatal);
return dev;
}
diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 29e9b6cc26..d908a38f73 100644
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -612,7 +612,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
pci_bus_set_slot_reserved_mask(pci_busA, 0xfffffff1);
pci_bus_set_slot_reserved_mask(pci_busB, 0xfffffff0);
- ebus = pci_new_multifunction(PCI_DEVFN(1, 0), true, TYPE_EBUS);
+ ebus = pci_new_multifunction(PCI_DEVFN(1, 0), TYPE_EBUS);
qdev_prop_set_uint64(DEVICE(ebus), "console-serial-base",
hwdef->console_serial_base);
pci_realize_and_unref(ebus, pci_busA, &error_fatal);
@@ -648,8 +648,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
if (!nd->model || strcmp(nd->model, mc->default_nic) == 0) {
if (!onboard_nic) {
- pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1),
- true, mc->default_nic);
+ pci_dev = pci_new_multifunction(PCI_DEVFN(1, 1),
mc->default_nic);
bus = pci_busA;
memcpy(&macaddr, &nd->macaddr.a, sizeof(MACAddr));
onboard_nic = true;
--
MST
- [PULL 25/66] hw/pci-host/i440fx: Replace magic values by existing constants, (continued)
- [PULL 25/66] hw/pci-host/i440fx: Replace magic values by existing constants, Michael S. Tsirkin, 2023/07/10
- [PULL 26/66] hw/pci-host/i440fx: Have common names for some local variables, Michael S. Tsirkin, 2023/07/10
- [PULL 27/66] hw/pci-host/i440fx: Move i440fx_realize() into PCII440FXState section, Michael S. Tsirkin, 2023/07/10
- [PULL 28/66] hw/pci-host/i440fx: Make MemoryRegion pointers accessible as properties, Michael S. Tsirkin, 2023/07/10
- [PULL 29/66] hw/pci-host/i440fx: Add PCI_HOST_PROP_IO_MEM property, Michael S. Tsirkin, 2023/07/10
- [PULL 30/66] hw/pci-host/i440fx: Add PCI_HOST_{ABOVE, BELOW}_4G_MEM_SIZE properties, Michael S. Tsirkin, 2023/07/10
- [PULL 31/66] hw/pci-host/i440fx: Add I440FX_HOST_PROP_PCI_TYPE property, Michael S. Tsirkin, 2023/07/10
- [PULL 32/66] hw/pci-host/i440fx: Resolve i440fx_init(), Michael S. Tsirkin, 2023/07/10
- [PULL 33/66] hw/i386/pc_piix: Move i440fx' realize near its qdev_new(), Michael S. Tsirkin, 2023/07/10
- [PULL 34/66] hw/pci/pci: Remove multifunction parameter from pci_create_simple_multifunction(), Michael S. Tsirkin, 2023/07/10
- [PULL 35/66] hw/pci/pci: Remove multifunction parameter from pci_new_multifunction(),
Michael S. Tsirkin <=
- [PULL 36/66] pcie: Release references of virtual functions, Michael S. Tsirkin, 2023/07/10
- [PULL 37/66] vdpa: Return -EIO if device ack is VIRTIO_NET_ERR in _load_mac(), Michael S. Tsirkin, 2023/07/10
- [PULL 38/66] vdpa: Return -EIO if device ack is VIRTIO_NET_ERR in _load_mq(), Michael S. Tsirkin, 2023/07/10
- [PULL 39/66] vdpa: Return -EIO if device ack is VIRTIO_NET_ERR in _load_offloads(), Michael S. Tsirkin, 2023/07/10
- [PULL 40/66] vhost-vdpa: mute unaligned memory error report, Michael S. Tsirkin, 2023/07/10
- [PULL 41/66] tests/acpi: allow changes in DSDT.noacpihp table blob, Michael S. Tsirkin, 2023/07/10
- [PULL 42/66] tests/acpi/bios-tables-test: use the correct slot on the pcie-root-port, Michael S. Tsirkin, 2023/07/10
- [PULL 43/66] tests/acpi/bios-tables-test: update acpi blob q35/DSDT.noacpihp, Michael S. Tsirkin, 2023/07/10
- [PULL 44/66] tests/qtest/hd-geo-test: fix incorrect pcie-root-port usage and simplify test, Michael S. Tsirkin, 2023/07/10
- [PULL 47/66] virtio-iommu: Rework the traces in virtio_iommu_set_page_size_mask(), Michael S. Tsirkin, 2023/07/10