From nobody Mon Feb 9 22:44:42 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@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1667323398; cv=none; d=zohomail.com; s=zohoarc; b=NOUgL1dGmwDJYx5cUXCS6S/6s9b2/p1/oE6XZONzZVqQOYtE/qSSvK2pvbz/Ll/U7t8PfAZZbsOd/LZhqO5HQIlHDLwRcFqzQoSX+xPlmLkWyA5fr/rbQuiUvBeeOiFRw2PX2A5oEJJ5Y1JtERrIzhIx/DJkr/KCgiW04X/qFhs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667323398; 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=dDreUR5jezLF3riCS4Nedv2mpPTTam6rSb+Yid4AgVMdLQu6b20Pqa9ciGEAM01L0+P+/AdO4jKhihzFi3BxdjB3zR+I6w/pSjALcHSx3RkvEd7ufjuDOSFDF/IFSjgIXWPTHyu8acoe3EDHgxeVAhbzu5fhCHrMSiIsRCRbMVc= 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@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1667323398878704.418059516191; Tue, 1 Nov 2022 10:23:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opshm-00074C-En; Tue, 01 Nov 2022 10:57:30 -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 1opshl-000744-AM for qemu-devel@nongnu.org; Tue, 01 Nov 2022 10:57:29 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opshj-0003lC-RV for qemu-devel@nongnu.org; Tue, 01 Nov 2022 10:57:29 -0400 Received: by mail-pj1-x102d.google.com with SMTP id l6so13464855pjj.0 for ; Tue, 01 Nov 2022 07:57:27 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id 22-20020a631656000000b0046f9f4a2de6sm4783219pgw.74.2022.11.01.07.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Nov 2022 07:57:24 -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=FTXuGwT5H/42DnZN5LxaKpuMG0kHwB4MdPiB6c+WKjKZZs2ofmL92o3h2iWOSPfSmP Ig0iyOXTrgsKMqCllpyrgeyL6MJmvpzWVD8hsmayOi2sWgdco1dJjNo+aluEDUVc0grC cFtZ9oxwa6X8csH9DYOT1Uwu80KeoEezjTDF/+/2t6gw102SwqfS6ancekLeVWXDkhwn 6V8wbbPv8b3NoKIuY0yJE0f76Lx5hFO3PSlsFYH4dktERoOqJNiwoTvesC5UQvSlygTp uwZtVWH6v/gCWirBdzIlgFiOXHeMrqsyIv7YXsrf55MoFJ4FPxdXyVYrufccJapSDa5B JOww== 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=2bfgU4PjWCW+3ixK83tDgBRhLMSWfJ4lwojZP2QVNbIAbWYPqS6dyGSRnbP0Y0QV3q Ab3H/3Eldoo9Yxy2BBz2GR3YgjfTkjAtlESDUTcdAESla7kmCIfZtZK4o27oVrJTCVXg bEkwV4lyj2zuO+36nAhvQ1VxyKUSGhBZH/Ygrc4E1BWryZMdykCelD+DRUFPutDBjdnt bCtKxQG1bLDnWOemMk5NR0uUosOzlutOrmUz7AB0LoAYZdrabf1OMHfkdgAXawZrnRG4 vUEbcccV94ea4EvsC3UuOTzTwD+9FaJ+H9vKy24TyjYgSB+VezEXcBPvwwwoPPg9+BlU tjnA== X-Gm-Message-State: ACrzQf3kcdMfFuaUG+Qx9DDtXupIJ1rmGMRvL7XRTpQkAaHtmRQbIPeb ZFbjU2eSdIgEiwJJ9O4XosLktSFx2VjyAVLv X-Google-Smtp-Source: AMsMyM4khqr2oNBvGtuqCGVH+J9F45lr5DmcqMFeKUDC/i8dRY7kX9e2H+sR28q57CKDvyNpQisEww== X-Received: by 2002:a17:902:a707:b0:178:bd1e:e8be with SMTP id w7-20020a170902a70700b00178bd1ee8bemr19943174plq.167.1667314644778; Tue, 01 Nov 2022 07:57:24 -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 v9 14/17] hw/pci-bridge/pcie_pci_bridge: Omit errp for pci_add_capability Date: Tue, 1 Nov 2022 23:55:55 +0900 Message-Id: <20221101145558.3998-15-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221101145558.3998-1-akihiko.odaki@daynix.com> References: <20221101145558.3998-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@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::102d; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102d.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@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20210112.gappssmtp.com) X-ZM-MESSAGEID: 1667323400307100001 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