[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-trivial] [PATCH 3/8] pci: Remove unused functions
From: |
Michael S. Tsirkin |
Subject: |
Re: [Qemu-trivial] [PATCH 3/8] pci: Remove unused functions |
Date: |
Wed, 18 Mar 2015 14:19:20 +0100 |
On Mon, Mar 09, 2015 at 06:30:10PM +0100, Thomas Huth wrote:
> The functions pcie_ari_init(), pcie_cap_is_arifwd_enabled()
> and ich9_d2pbr_init() are completely unused and thus can
> be deleted.
>
> Signed-off-by: Thomas Huth <address@hidden>
> Cc: Michael S. Tsirkin <address@hidden>
> Cc: Anthony Liguori <address@hidden>
Pls split this out to two patches. ARI might be useful in the future.
ich9_d2pbr_init can go I think.
> ---
> hw/pci-bridge/i82801b11.c | 21 ---------------------
> hw/pci/pcie.c | 25 -------------------------
> include/hw/i386/ich9.h | 1 -
> include/hw/pci/pcie.h | 3 ---
> 4 files changed, 0 insertions(+), 50 deletions(-)
>
> diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c
> index 14cd7fd..7e79bc0 100644
> --- a/hw/pci-bridge/i82801b11.c
> +++ b/hw/pci-bridge/i82801b11.c
> @@ -101,27 +101,6 @@ static const TypeInfo i82801b11_bridge_info = {
> .class_init = i82801b11_bridge_class_init,
> };
>
> -PCIBus *ich9_d2pbr_init(PCIBus *bus, int devfn, int sec_bus)
> -{
> - PCIDevice *d;
> - PCIBridge *br;
> - char buf[16];
> - DeviceState *qdev;
> -
> - d = pci_create_multifunction(bus, devfn, true, "i82801b11-bridge");
> - if (!d) {
> - return NULL;
> - }
> - br = PCI_BRIDGE(d);
> - qdev = DEVICE(d);
> -
> - snprintf(buf, sizeof(buf), "pci.%d", sec_bus);
> - pci_bridge_map_irq(br, buf, pci_swizzle_map_irq_fn);
> - qdev_init_nofail(qdev);
> -
> - return pci_bridge_get_sec_bus(br);
> -}
> -
> static void d2pbr_register(void)
> {
> type_register_static(&i82801b11_bridge_info);
> diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
> index 1abbbb1..9b9f63d 100644
> --- a/hw/pci/pcie.c
> +++ b/hw/pci/pcie.c
> @@ -515,19 +515,6 @@ void pcie_cap_arifwd_reset(PCIDevice *dev)
> pci_long_test_and_clear_mask(devctl2, PCI_EXP_DEVCTL2_ARI);
> }
>
> -bool pcie_cap_is_arifwd_enabled(const PCIDevice *dev)
> -{
> - if (!pci_is_express(dev)) {
> - return false;
> - }
> - if (!dev->exp.exp_cap) {
> - return false;
> - }
> -
> - return pci_get_long(dev->config + dev->exp.exp_cap + PCI_EXP_DEVCTL2) &
> - PCI_EXP_DEVCTL2_ARI;
> -}
> -
> /**************************************************************************
> * pci express extended capability list management functions
> * uint16_t ext_cap_id (16 bit)
> @@ -621,15 +608,3 @@ void pcie_add_capability(PCIDevice *dev,
> /* Check capability by default */
> memset(dev->cmask + offset, 0xFF, size);
> }
> -
> -/**************************************************************************
> - * pci express extended capability helper functions
> - */
> -
> -/* ARI */
> -void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn)
> -{
> - pcie_add_capability(dev, PCI_EXT_CAP_ID_ARI, PCI_ARI_VER,
> - offset, PCI_ARI_SIZEOF);
> - pci_set_long(dev->config + offset + PCI_ARI_CAP, (nextfn & 0xff) << 8);
> -}
> diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
> index 59ea25b..5cede9b 100644
> --- a/include/hw/i386/ich9.h
> +++ b/include/hw/i386/ich9.h
> @@ -19,7 +19,6 @@ void ich9_lpc_set_irq(void *opaque, int irq_num, int level);
> int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);
> PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin);
> void ich9_lpc_pm_init(PCIDevice *pci_lpc);
> -PCIBus *ich9_d2pbr_init(PCIBus *bus, int devfn, int sec_bus);
> I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
>
> #define ICH9_CC_SIZE (16 * 1024) /* 16KB */
> diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h
> index b48a7a2..ae0969a 100644
> --- a/include/hw/pci/pcie.h
> +++ b/include/hw/pci/pcie.h
> @@ -106,7 +106,6 @@ void pcie_cap_flr_write_config(PCIDevice *dev,
> /* ARI forwarding capability and control */
> void pcie_cap_arifwd_init(PCIDevice *dev);
> void pcie_cap_arifwd_reset(PCIDevice *dev);
> -bool pcie_cap_is_arifwd_enabled(const PCIDevice *dev);
>
> /* PCI express extended capability helper functions */
> uint16_t pcie_find_capability(PCIDevice *dev, uint16_t cap_id);
> @@ -114,8 +113,6 @@ void pcie_add_capability(PCIDevice *dev,
> uint16_t cap_id, uint8_t cap_ver,
> uint16_t offset, uint16_t size);
>
> -void pcie_ari_init(PCIDevice *dev, uint16_t offset, uint16_t nextfn);
> -
> extern const VMStateDescription vmstate_pcie_device;
>
> #define VMSTATE_PCIE_DEVICE(_field, _state) { \
> --
> 1.7.1
>
- [Qemu-trivial] [PATCH 4/8] monitor: Remove unused functions, (continued)
- [Qemu-trivial] [PATCH 4/8] monitor: Remove unused functions, Thomas Huth, 2015/03/09
- [Qemu-trivial] [PATCH 6/8] usb: Remove unused functions, Thomas Huth, 2015/03/09
- [Qemu-trivial] [PATCH 2/8] vmxnet: Remove unused function vmxnet_rx_pkt_get_num_frags(), Thomas Huth, 2015/03/09
- [Qemu-trivial] [PATCH 7/8] util: Remove unused functions, Thomas Huth, 2015/03/09
- [Qemu-trivial] [PATCH 5/8] ioport: Remove unused functions, Thomas Huth, 2015/03/09
- [Qemu-trivial] [PATCH 3/8] pci: Remove unused functions, Thomas Huth, 2015/03/09
- [Qemu-trivial] [PATCH 1/8] migration: Remove unused functions, Thomas Huth, 2015/03/09
- [Qemu-trivial] [PATCH 8/8] Remove various unused functions, Thomas Huth, 2015/03/09