From nobody Sun Apr 28 10:02:46 2024 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 Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1508041576214178.9349206570489; Sat, 14 Oct 2017 21:26:16 -0700 (PDT) Received: from localhost ([::1]:56124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3aUu-00088M-T8 for importer@patchew.org; Sun, 15 Oct 2017 00:25:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3aU4-0007mY-Gl for qemu-devel@nongnu.org; Sun, 15 Oct 2017 00:25:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3aU1-00015o-DL for qemu-devel@nongnu.org; Sun, 15 Oct 2017 00:25:04 -0400 Received: from ozlabs.ru ([107.173.13.209]:52658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3aU1-00015i-7N for qemu-devel@nongnu.org; Sun, 15 Oct 2017 00:25:01 -0400 Received: from vpl1.ozlabs.ibm.com (localhost [IPv6:::1]) by ozlabs.ru (Postfix) with ESMTP id 85A983A60009; Sun, 15 Oct 2017 00:23:46 -0400 (EDT) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Sun, 15 Oct 2017 15:24:52 +1100 Message-Id: <20171015042452.31714-1-aik@ozlabs.ru> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 107.173.13.209 Subject: [Qemu-devel] [PATCH qemu v2 REPOST] pci: Initialize pci_dev->name before use 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: Alexey Kardashevskiy , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" This moves pci_dev->name initialization earlier so pci_dev->bus_master_as could get a name instead of an empty string. Reviewed-by: Philippe Mathieu-Daud=C3=83=C2=A9 Signed-off-by: Alexey Kardashevskiy Reviewed-by: Peter Xu --- Changes: v2: * fixed mistype in the commit log * added "rb" --- hw/pci/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 1e6fb88eba..05c5f75ef0 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1020,6 +1020,7 @@ static PCIDevice *do_pci_register_device(PCIDevice *p= ci_dev, PCIBus *bus, =20 pci_dev->devfn =3D devfn; pci_dev->requester_id_cache =3D pci_req_id_cache_get(pci_dev); + pstrcpy(pci_dev->name, sizeof(pci_dev->name), name); =20 memory_region_init(&pci_dev->bus_master_container_region, OBJECT(pci_d= ev), "bus master container", UINT64_MAX); @@ -1029,7 +1030,6 @@ static PCIDevice *do_pci_register_device(PCIDevice *p= ci_dev, PCIBus *bus, if (qdev_hotplug) { pci_init_bus_master(pci_dev); } - pstrcpy(pci_dev->name, sizeof(pci_dev->name), name); pci_dev->irq_state =3D 0; pci_config_alloc(pci_dev); =20 --=20 2.11.0