From nobody Fri Nov 7 12:28:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1539208647878797.3454259026313; Wed, 10 Oct 2018 14:57:27 -0700 (PDT) Received: from localhost ([::1]:59305 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAMTu-0003Fx-Nc for importer@patchew.org; Wed, 10 Oct 2018 17:57:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAMQg-00018j-Mu for qemu-devel@nongnu.org; Wed, 10 Oct 2018 17:54:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAMQe-000183-9b for qemu-devel@nongnu.org; Wed, 10 Oct 2018 17:54:06 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:38138) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gAMQd-00017a-SH for qemu-devel@nongnu.org; Wed, 10 Oct 2018 17:54:04 -0400 Received: by mail-wm1-x329.google.com with SMTP id 193-v6so7245006wme.3 for ; Wed, 10 Oct 2018 14:54:03 -0700 (PDT) Received: from x1.local (26.red-83-32-208.dynamicip.rima-tde.net. [83.32.208.26]) by smtp.gmail.com with ESMTPSA id x16-v6sm15820906wro.84.2018.10.10.14.54.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Oct 2018 14:54:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IH8Wot9kA+bZaGxgiTHsgOXfkDze7C5W1d+zGNxsEPg=; b=KBs4u5dvcdbQXKrCDEacQXfxEgFoktF7/nm/vvNxx51/2iGaG9bFgSLFXscfkXa6c5 qGNXUxULXBHTX5R8wWGw9P8UdI2PF45Q+hOnasqYMK5o1P3QF8M3YOHOuip+ns46D2z1 0QQw5r+hdttfUw/5dp37eVcGvuFZTAjs5KIYfUn0Rjfb/r2oTXIezUmjt1OmRVcLjaWe 2G3mBdjcMiXrrTLXE3cU3II5k8P5gHJdhvrpv9fl02pWZ7uYdjzgdZMez4LFFQFy7UIL s/gqQIW/Ramp+OR2sy8KXx6ha6uI4MXImNie3leGTdX3bkfTyd1CB57dej7XRBWf4QTb 7fiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=IH8Wot9kA+bZaGxgiTHsgOXfkDze7C5W1d+zGNxsEPg=; b=SOfDqow7LwR5oFIUItphnG19qtsBvLSPI8ic45VRpAz6NUNX0zIFYieSi34rK+iU0H +PVaCesCFaVTVT8LFfykLBdZrG5XaAW1ZvK3Ah5Xg6nwCvOQglE0o4RdYUvOglOZCUCb yfYHpSzmjJ4EwLWuPMvrfa1rWqKHQamJJg7uZDpZgeenv2EtsVnVZRpwqKTSibpUY3EI R37PV4MqSbN59vEBE3/ExB6dvouR5i4s/LgykQaMipELDjuplMqPGt8YLN31n491sxlF Ejz4nXmaC1cxZXn6Xz0UMwSnjLQpmvvKP73ZAcTm5TJ8qn2Zt0WCp5HMOTjD9rqL+t8Z ZfIw== X-Gm-Message-State: ABuFfoiCeA4CQHSlFh56x13vQhD8McFJlCk2szpum6bYSzdfmLJodWxl OV4fnrt9uSlRDHprWR5WKcs= X-Google-Smtp-Source: ACcGV63N6D5KoAZ3U72c8QEZppxe+mFRR7YS+J9Jlyts191oXQPCvvsyBqTc1FCX398ezJePCwuMTA== X-Received: by 2002:a1c:ab54:: with SMTP id u81-v6mr2226569wme.45.1539208442804; Wed, 10 Oct 2018 14:54:02 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: "Michael S. Tsirkin" , Marcel Apfelbaum , Isaku Yamahata Date: Wed, 10 Oct 2018 23:53:53 +0200 Message-Id: <20181010215355.16221-2-f4bug@amsat.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181010215355.16221-1-f4bug@amsat.org> References: <20181010215355.16221-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::329 Subject: [Qemu-devel] [PATCH 1/3] hw/pci-bridge/xio3130: Remove unused functions X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Introduced in 48ebf2f90f8 and faf1e708d5b, these functions were never used. Remove them. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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_dow= nstream.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 multifuncti= on, - 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_upstr= eam.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_i= rq, - uint8_t port); - -#endif /* QEMU_XIO3130_UPSTREAM_H */ diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_dow= nstream.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" =20 #define PCI_DEVICE_ID_TI_XIO3130D 0x8233 /* downstream port */ @@ -127,32 +127,6 @@ static void xio3130_downstream_exitfn(PCIDevice *d) pci_bridge_exitfn(d); } =20 -PCIESlot *xio3130_downstream_init(PCIBus *bus, int devfn, bool multifuncti= on, - 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 =3D pci_create_multifunction(bus, devfn, multifunction, - "xio3130-downstream"); - if (!d) { - return NULL; - } - br =3D PCI_BRIDGE(d); - - qdev =3D 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[] =3D { 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_upstr= eam.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" =20 #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); } =20 -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 =3D pci_create_multifunction(bus, devfn, multifunction, "x3130-upstr= eam"); - if (!d) { - return NULL; - } - br =3D PCI_BRIDGE(d); - - qdev =3D 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 =3D { .name =3D "xio3130-express-upstream-port", .priority =3D MIG_PRI_PCI_BUS, --=20 2.19.1