From nobody Sun Feb 8 22:07:16 2026 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1545332257540798.2551454746471; Thu, 20 Dec 2018 10:57:37 -0800 (PST) Received: from localhost ([::1]:39362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga3Vn-0002pg-IQ for importer@patchew.org; Thu, 20 Dec 2018 13:57:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60121) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ga3El-0005Hk-UH for qemu-devel@nongnu.org; Thu, 20 Dec 2018 13:40:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ga3Ek-0001DT-FD for qemu-devel@nongnu.org; Thu, 20 Dec 2018 13:39:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55858) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ga3Ej-0001Ag-Up for qemu-devel@nongnu.org; Thu, 20 Dec 2018 13:39:58 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A912E8CD5; Thu, 20 Dec 2018 18:39:56 +0000 (UTC) Received: from redhat.com (ovpn-122-182.rdu2.redhat.com [10.10.122.182]) by smtp.corp.redhat.com (Postfix) with SMTP id 5FF464A7; Thu, 20 Dec 2018 18:39:55 +0000 (UTC) Date: Thu, 20 Dec 2018 13:39:54 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20181220183059.20726-32-mst@redhat.com> References: <20181220183059.20726-1-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20181220183059.20726-1-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 20 Dec 2018 18:39:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL v3 31/44] pci/pcie: rename hotplug handler callbacks 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: Peter Maydell , Igor Mammedov , David Gibson , David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: David Hildenbrand The callbacks are also called for cold plugged devices. Drop the "hot" to better match the actual callback names. While at it, also rename pcie_cap_slot_hotplug_common() to pcie_cap_slot_plug_common(). Reviewed-by: David Gibson Reviewed-by: Igor Mammedov Signed-off-by: David Hildenbrand Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- include/hw/pci/pcie.h | 8 ++++---- hw/pci/pcie.c | 17 ++++++++--------- hw/pci/pcie_port.c | 4 ++-- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index 1976909ab4..d51ca23f07 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -132,8 +132,8 @@ void pcie_ari_init(PCIDevice *dev, uint16_t offset, uin= t16_t nextfn); void pcie_dev_ser_num_init(PCIDevice *dev, uint16_t offset, uint64_t ser_n= um); void pcie_ats_init(PCIDevice *dev, uint16_t offset); =20 -void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *de= v, - Error **errp); -void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp); +void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, + Error **errp); +void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp); #endif /* QEMU_PCIE_H */ diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c index d91a615193..ec3b1145f3 100644 --- a/hw/pci/pcie.c +++ b/hw/pci/pcie.c @@ -390,9 +390,8 @@ static void pcie_cap_slot_event(PCIDevice *dev, PCIExpr= essHotPlugEvent event) hotplug_event_notify(dev); } =20 -static void pcie_cap_slot_hotplug_common(PCIDevice *hotplug_dev, - DeviceState *dev, - uint8_t **exp_cap, Error **errp) +static void pcie_cap_slot_plug_common(PCIDevice *hotplug_dev, DeviceState = *dev, + uint8_t **exp_cap, Error **errp) { *exp_cap =3D hotplug_dev->config + hotplug_dev->exp.exp_cap; uint16_t sltsta =3D pci_get_word(*exp_cap + PCI_EXP_SLTSTA); @@ -406,13 +405,13 @@ static void pcie_cap_slot_hotplug_common(PCIDevice *h= otplug_dev, } } =20 -void pcie_cap_slot_hotplug_cb(HotplugHandler *hotplug_dev, DeviceState *de= v, - Error **errp) +void pcie_cap_slot_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, + Error **errp) { uint8_t *exp_cap; PCIDevice *pci_dev =3D PCI_DEVICE(dev); =20 - pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, e= rrp); + pcie_cap_slot_plug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp= ); =20 /* Don't send event when device is enabled during qemu machine creatio= n: * it is present on boot, no hotplug event is necessary. We do send an @@ -448,14 +447,14 @@ static void pcie_unplug_device(PCIBus *bus, PCIDevice= *dev, void *opaque) object_unparent(OBJECT(dev)); } =20 -void pcie_cap_slot_hot_unplug_request_cb(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) +void pcie_cap_slot_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) { uint8_t *exp_cap; PCIDevice *pci_dev =3D PCI_DEVICE(dev); PCIBus *bus =3D pci_get_bus(pci_dev); =20 - pcie_cap_slot_hotplug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, e= rrp); + pcie_cap_slot_plug_common(PCI_DEVICE(hotplug_dev), dev, &exp_cap, errp= ); =20 /* In case user cancel the operation of multi-function hot-add, * remove the function that is unexposed to guest individually, diff --git a/hw/pci/pcie_port.c b/hw/pci/pcie_port.c index 6432b9ac1f..73e81e5847 100644 --- a/hw/pci/pcie_port.c +++ b/hw/pci/pcie_port.c @@ -154,8 +154,8 @@ static void pcie_slot_class_init(ObjectClass *oc, void = *data) HotplugHandlerClass *hc =3D HOTPLUG_HANDLER_CLASS(oc); =20 dc->props =3D pcie_slot_props; - hc->plug =3D pcie_cap_slot_hotplug_cb; - hc->unplug_request =3D pcie_cap_slot_hot_unplug_request_cb; + hc->plug =3D pcie_cap_slot_plug_cb; + hc->unplug_request =3D pcie_cap_slot_unplug_request_cb; } =20 static const TypeInfo pcie_slot_type_info =3D { --=20 MST