From nobody Tue Feb 10 19:17:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1667316237; cv=none; d=zohomail.com; s=zohoarc; b=kOgBynmSroK62Y7vBs0SkQw5aV6nCscbfrjaeK3W3+F/v/eFt9FsmAZcmhQqCsJe9Gfq8NzVg3rt/KODjWNShEquCa6XJgeh8eylb0aTJNVEbMlD7wIMsvhIrQss2BMyN6OVKDoAz6V/iyh2lopP/IeTmv1Ti37/81j2tRajlfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667316237; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=SnM99KyqX7P48Yqolo9mjrgei37okMKuMCflMKIVI0w=; b=Fntg761tV+/KTtOkbRXMT4Ngg7OINWXt4XSIGSZEHxYYs2v8vfOS2lGCioG6wg1dGUDAp54WQDihEiKRG12wCPIizQ9eR8EnLES7bjX5aCINMP52xJ4Y7vrnQHLzQwMSxrP2VzpVlCpGFghrZqh/J3bM770EmCUki02IGIwF/is= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1667316237392353.68122358977155; Tue, 1 Nov 2022 08:23:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oprnT-00067X-K4; Tue, 01 Nov 2022 09:59:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oprnR-00066o-Dn for qemu-devel@nongnu.org; Tue, 01 Nov 2022 09:59:17 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oprnO-0004e5-T8 for qemu-devel@nongnu.org; Tue, 01 Nov 2022 09:59:17 -0400 Received: by mail-pl1-x634.google.com with SMTP id g24so13640617plq.3 for ; Tue, 01 Nov 2022 06:59:14 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id y4-20020aa79ae4000000b0056bdc3f5b29sm6510722pfp.186.2022.11.01.06.59.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 06:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SnM99KyqX7P48Yqolo9mjrgei37okMKuMCflMKIVI0w=; b=gqCUXh9WH1PgFdB7Kpa9JkjgpTKGzAslWot+Mpop1Wc7dMc8on563mp2lWtAiWcdzw be/Q9/pAdeEijPNx8bzCuwwsb5FVjj9vu5FbUQmkqu9pMKbaZqU4HuUZv/x/AfrV3Gq5 QofD637ncA+yoxaoGZDsPBomX7yzlE+Sl4u/tfTDqk5uvlhnjKaRIGpG3aerkWWQ9Fzq bqAwato8ghCrANghto+VnyXMOEaHwmczI59pJnPon4QluvoeEuEHmsX4sH3hUilh3B0v H4zuIjl2GWhxZeC4rEk6u7fzwnZci1zQ7tLGOKh6wSYf2V0gTscYIGFqcHRvpKZe8VEN LSXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SnM99KyqX7P48Yqolo9mjrgei37okMKuMCflMKIVI0w=; b=kXToSyYgLDqQw2nqgCLMthRzfrdY3DZkoLC2sQDcGGhhMGRwUkQkm1jOiazqO40wIc 706prptRePbHIE8HnPDfCigCpz1KpNVYbotC0O04wK2zzX3OrAMy5gY1EJ4zdmssqtgA SilzaLEx9EadhENPevtnDsQ4RqiQ9yeX0Wv8ZXAYJB1/x2+MYzyJ2ueUIfbFz7/dtnhR 1/VPliIo6qIs/Os4djf9PupNM5LMfXT25tbYvOIhK+U3Q/Y0Gel0kvzmlnhtdZBC9mh9 dqMOIPyX0CuiPwNijcUPq6PSXVA71QKsZKfT8a1kLGSLbuStPsM5y0GrApZgaYDaBwmX KO1Q== X-Gm-Message-State: ACrzQf3Bs7nH7t8BrspThGkncuqbfdMHE0wwNWm8wEtCf2UI2GMUGTa4 szBjEv/YbCKga6PdUTQv1gKnAwU2eI0AKBT2 X-Google-Smtp-Source: AMsMyM47NuDUYHjSqpTMdFxOMFrwxZHHe+HlFaq6vOumH5A5oGVqza0dPOl5d9lqZY091UqZCgRVpA== X-Received: by 2002:a17:902:d512:b0:181:f1f4:fcb4 with SMTP id b18-20020a170902d51200b00181f1f4fcb4mr19933757plg.102.1667311153360; Tue, 01 Nov 2022 06:59:13 -0700 (PDT) From: Akihiko Odaki To: Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, "Michael S . Tsirkin" , Marcel Apfelbaum , Gerd Hoffmann , Paolo Bonzini , Richard Henderson , Eduardo Habkost , John Snow , Dmitry Fleytman , Jason Wang , Stefan Weil , Keith Busch , Klaus Jensen , Peter Maydell , Andrey Smirnov , Paul Burton , Aleksandar Rikalo , Yan Vugenfirer , Yuri Benditovich , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PATCH v8 14/17] hw/pci-bridge/pcie_pci_bridge: Omit errp for pci_add_capability Date: Tue, 1 Nov 2022 22:57:46 +0900 Message-Id: <20221101135749.4477-15-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221101135749.4477-1-akihiko.odaki@daynix.com> References: <20221101135749.4477-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::634; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x634.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1667316238247100001 Content-Type: text/plain; charset="utf-8" Omitting errp for pci_add_capability() causes it to abort if capabilities overlap. This behavior is appropriate heare because all of the capabilities set in this device are defined in the program and their overlap should not happen unless there is a programming error. Signed-off-by: Akihiko Odaki --- hw/pci-bridge/pcie_pci_bridge.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridg= e.c index 99778e3e24..1b839465e7 100644 --- a/hw/pci-bridge/pcie_pci_bridge.c +++ b/hw/pci-bridge/pcie_pci_bridge.c @@ -35,7 +35,7 @@ static void pcie_pci_bridge_realize(PCIDevice *d, Error *= *errp) { PCIBridge *br =3D PCI_BRIDGE(d); PCIEPCIBridge *pcie_br =3D PCIE_PCI_BRIDGE_DEV(d); - int rc, pos; + int rc; =20 pci_bridge_initfn(d, TYPE_PCI_BUS); =20 @@ -49,12 +49,8 @@ static void pcie_pci_bridge_realize(PCIDevice *d, Error = **errp) =20 pcie_cap_init(d, 0, PCI_EXP_TYPE_PCI_BRIDGE, 0); =20 - pos =3D pci_add_capability(d, PCI_CAP_ID_PM, 0, PCI_PM_SIZEOF, errp); - if (pos < 0) { - goto pm_error; - } - d->exp.pm_cap =3D pos; - pci_set_word(d->config + pos + PCI_PM_PMC, 0x3); + d->exp.pm_cap =3D pci_add_capability(d, PCI_CAP_ID_PM, 0, PCI_PM_SIZEO= F); + pci_set_word(d->config + d->exp.pm_cap + PCI_PM_PMC, 0x3); =20 pcie_cap_arifwd_init(d); pcie_cap_deverr_init(d); @@ -85,7 +81,6 @@ static void pcie_pci_bridge_realize(PCIDevice *d, Error *= *errp) msi_error: pcie_aer_exit(d); aer_error: -pm_error: pcie_cap_exit(d); shpc_cleanup(d, &pcie_br->shpc_bar); error: --=20 2.38.1