[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/33] hw/pci-bridge/xio3130: Remove unused functions
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 26/33] hw/pci-bridge/xio3130: Remove unused functions |
Date: |
Mon, 5 Nov 2018 13:16:57 -0500 |
From: Philippe Mathieu-Daudé <address@hidden>
Introduced in 48ebf2f90f8 and faf1e708d5b, these functions
were never used. Remove them.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci-bridge/xio3130_downstream.h | 11 -----------
hw/pci-bridge/xio3130_upstream.h | 10 ----------
hw/pci-bridge/xio3130_downstream.c | 28 +---------------------------
hw/pci-bridge/xio3130_upstream.c | 24 +-----------------------
4 files changed, 2 insertions(+), 71 deletions(-)
delete mode 100644 hw/pci-bridge/xio3130_downstream.h
delete mode 100644 hw/pci-bridge/xio3130_upstream.h
diff --git a/hw/pci-bridge/xio3130_downstream.h
b/hw/pci-bridge/xio3130_downstream.h
deleted file mode 100644
index 8426d9ffa6..0000000000
--- a/hw/pci-bridge/xio3130_downstream.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef QEMU_XIO3130_DOWNSTREAM_H
-#define QEMU_XIO3130_DOWNSTREAM_H
-
-#include "hw/pci/pcie_port.h"
-
-PCIESlot *xio3130_downstream_init(PCIBus *bus, int devfn, bool multifunction,
- const char *bus_name, pci_map_irq_fn map_irq,
- uint8_t port, uint8_t chassis,
- uint16_t slot);
-
-#endif /* QEMU_XIO3130_DOWNSTREAM_H */
diff --git a/hw/pci-bridge/xio3130_upstream.h b/hw/pci-bridge/xio3130_upstream.h
deleted file mode 100644
index d0ab7577e2..0000000000
--- a/hw/pci-bridge/xio3130_upstream.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef QEMU_XIO3130_UPSTREAM_H
-#define QEMU_XIO3130_UPSTREAM_H
-
-#include "hw/pci/pcie_port.h"
-
-PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction,
- const char *bus_name, pci_map_irq_fn map_irq,
- uint8_t port);
-
-#endif /* QEMU_XIO3130_UPSTREAM_H */
diff --git a/hw/pci-bridge/xio3130_downstream.c
b/hw/pci-bridge/xio3130_downstream.c
index b202657954..467bbabe4c 100644
--- a/hw/pci-bridge/xio3130_downstream.c
+++ b/hw/pci-bridge/xio3130_downstream.c
@@ -23,7 +23,7 @@
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/pcie.h"
-#include "xio3130_downstream.h"
+#include "hw/pci/pcie_port.h"
#include "qapi/error.h"
#define PCI_DEVICE_ID_TI_XIO3130D 0x8233 /* downstream port */
@@ -127,32 +127,6 @@ static void xio3130_downstream_exitfn(PCIDevice *d)
pci_bridge_exitfn(d);
}
-PCIESlot *xio3130_downstream_init(PCIBus *bus, int devfn, bool multifunction,
- const char *bus_name, pci_map_irq_fn map_irq,
- uint8_t port, uint8_t chassis,
- uint16_t slot)
-{
- PCIDevice *d;
- PCIBridge *br;
- DeviceState *qdev;
-
- d = pci_create_multifunction(bus, devfn, multifunction,
- "xio3130-downstream");
- if (!d) {
- return NULL;
- }
- br = PCI_BRIDGE(d);
-
- qdev = DEVICE(d);
- pci_bridge_map_irq(br, bus_name, map_irq);
- qdev_prop_set_uint8(qdev, "port", port);
- qdev_prop_set_uint8(qdev, "chassis", chassis);
- qdev_prop_set_uint16(qdev, "slot", slot);
- qdev_init_nofail(qdev);
-
- return PCIE_SLOT(d);
-}
-
static Property xio3130_downstream_props[] = {
DEFINE_PROP_BIT(COMPAT_PROP_PCP, PCIDevice, cap_present,
QEMU_PCIE_SLTCAP_PCP_BITNR, true),
diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c
index bca2f9a5ea..b524908cf1 100644
--- a/hw/pci-bridge/xio3130_upstream.c
+++ b/hw/pci-bridge/xio3130_upstream.c
@@ -23,7 +23,7 @@
#include "hw/pci/pci_ids.h"
#include "hw/pci/msi.h"
#include "hw/pci/pcie.h"
-#include "xio3130_upstream.h"
+#include "hw/pci/pcie_port.h"
#define PCI_DEVICE_ID_TI_XIO3130U 0x8232 /* upstream port */
#define XIO3130_REVISION 0x2
@@ -108,28 +108,6 @@ static void xio3130_upstream_exitfn(PCIDevice *d)
pci_bridge_exitfn(d);
}
-PCIEPort *xio3130_upstream_init(PCIBus *bus, int devfn, bool multifunction,
- const char *bus_name, pci_map_irq_fn map_irq,
- uint8_t port)
-{
- PCIDevice *d;
- PCIBridge *br;
- DeviceState *qdev;
-
- d = pci_create_multifunction(bus, devfn, multifunction, "x3130-upstream");
- if (!d) {
- return NULL;
- }
- br = PCI_BRIDGE(d);
-
- qdev = DEVICE(d);
- pci_bridge_map_irq(br, bus_name, map_irq);
- qdev_prop_set_uint8(qdev, "port", port);
- qdev_init_nofail(qdev);
-
- return PCIE_PORT(d);
-}
-
static const VMStateDescription vmstate_xio3130_upstream = {
.name = "xio3130-express-upstream-port",
.priority = MIG_PRI_PCI_BUS,
--
MST
- [Qemu-devel] [PULL 21/33] pci-testdev: add optional memory bar, (continued)
- [Qemu-devel] [PULL 21/33] pci-testdev: add optional memory bar, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 10/33] vhost-user-blk: start vhost when guest kicks, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 11/33] x86_iommu: move the kernel-irqchip check in common code, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 23/33] hw/pci-host/x86: extend the 64-bit PCI hole relative to the fw-assigned base, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 20/33] MAINTAINERS: list "tests/acpi-test-data" files in ACPI/SMBIOS section, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 19/33] x86_iommu/amd: Enable Guest virtual APIC support, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 17/33] i386: acpi: add IVHD device entry for IOAPIC, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 12/33] x86_iommu: move vtd_generate_msi_message in common file, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 15/33] x86_iommu/amd: Prepare for interrupt remap support, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 24/33] bios-tables-test: prepare expected files for mmio64, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 26/33] hw/pci-bridge/xio3130: Remove unused functions,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 25/33] tests/bios-tables-test: add 64-bit PCI MMIO aperture round-up test on Q35, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 28/33] hw/pci: Add missing include, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 22/33] hw/pci-host/x86: extract get_pci_hole64_start_value() helpers, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 27/33] hw/pci-bridge/ioh3420: Remove unuseful header, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 29/33] pci_bridge: fix typo in comment, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 30/33] i440fx: use ARRAY_SIZE for pam_regions, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 31/33] piix: use TYPE_FOO constants than string constats, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 32/33] piix_pci: fix i440fx data sheet link, Michael S. Tsirkin, 2018/11/05
- [Qemu-devel] [PULL 33/33] vhost-scsi: prevent using uninitialized vqs, Michael S. Tsirkin, 2018/11/05
- Re: [Qemu-devel] [PULL 00/33] pci, pc, virtio: fixes, features, Thomas Huth, 2018/11/06