From nobody Tue Feb 10 23:14:43 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=1666960339; cv=none; d=zohomail.com; s=zohoarc; b=Bn2l3e/mYb36jeJpc9hNef4csP/7z/Mnozw11CleWeA4ZZoDaXeHSLrqLXCAbxbuDQSGlebc3Y3Qgufhk+5zKPirOusJ4fPojXKNSG4RBtZxb4RAlIXp7/y2j0/UzTYaWJjEUcU5cmENwNETCphGmoH/RcDeQ5lnRfDrD4g5NC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666960339; 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=/9im1Kc9g5XlZqij06cd6/OXySKGlV0zzS1vFEiVRn4=; b=hcn7ailRXMeAymrzfoHSJSE4M4R/OZ2j8nan60ANFItDRiqPIgHWjeomrrvOxa/y4Fmr/fIa7s/7jbRwHpwHusPQWnpixJweSyet/akLgpt+Nq1EHt++L2qAL5juTrWHM1Humg2zS0bnNtUshxb265K/PA9pfrOsCq8Z7t1COG0= 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 1666960339763913.5503968744927; Fri, 28 Oct 2022 05:32:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooOSy-0003ex-Qz; Fri, 28 Oct 2022 08:28:04 -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 1ooOS7-0002r0-2G for qemu-devel@nongnu.org; Fri, 28 Oct 2022 08:27:17 -0400 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ooOS5-0003Jv-GT for qemu-devel@nongnu.org; Fri, 28 Oct 2022 08:27:10 -0400 Received: by mail-pl1-x629.google.com with SMTP id v17so1688157plo.1 for ; Fri, 28 Oct 2022 05:27:09 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id x3-20020a170902ec8300b00174d9bbeda4sm2948456plg.197.2022.10.28.05.27.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 05:27:07 -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=/9im1Kc9g5XlZqij06cd6/OXySKGlV0zzS1vFEiVRn4=; b=syQxPk3727bRaoArn3+ixu+LBdU28sXlkR4W09rZF9jYfuc5hyNMx5tveBdWfkoQg6 2DBJ9hIbYgGf27MsG/8RNNW2JNPPgQ5yA67R04LzEFD7Ig3eiGsWXuUTxFC/kTTkHvf8 IAZmy1/e5keyK3kMt6xWfDudyS6BAu82+0HEeyHDd50xtWndnUDbirnPHB5Bvfw1ZtN2 JIQ7rHbaN6lcDdK8aBCv0d6Fm+M8OwzNT3sZfLXMXYgvOh1l1Vhp+gyTKYid+h6XsDTS 7qmRwj0KmMqmdpeUIWcqFY+UPTA+9XdCugHuiFoMm6yikrg4S85dxUMFQOAR3lx6YNoz kzow== 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=/9im1Kc9g5XlZqij06cd6/OXySKGlV0zzS1vFEiVRn4=; b=QrhykDZfDZX3TKbfh1x7LmZwtpnzAD2juIvohPxLR+5R7mInEawUb6QzxB30l84Z3u dgTwz5r7C/2jvcLyFUs6D8WRDC7becVWmTllhFzxbWSVv0xiknaLs2E0eni398cIVc9m vl6cviIt3uuKyCIK/lVCqN56zaB762LXDnj186GQo9nu2wKKJA5xuolZffNl6eWWnj0e 7VPstUk/clRc9j86rDG8VnXFwezWikk9N/aBSQTo6IsQJxj8F5G08y52I2yjYDiwdJd4 4ZulCPDorkSi39Qnz/gRd74+bJrtxU8TRuDbHq3OUiNgB5M5WFq94v74z2C2F6IAHHo/ wzaw== X-Gm-Message-State: ACrzQf1ZyG6puyhFOTabT3fPUHWs/RMYdmOOHPyOQou4uWq1GpHs3Ikv fUwVUOlxpbRYddTLbbzZ1WWAqg== X-Google-Smtp-Source: AMsMyM6EGCojmWTtV7K5wTZ1C9LEmamet7oL5uQhl+kLfPz8ooNuOTRkHqyNS04wkVz/ycg+43NAHA== X-Received: by 2002:a17:90a:7d13:b0:211:b993:8319 with SMTP id g19-20020a17090a7d1300b00211b9938319mr16452762pjl.139.1666960028002; Fri, 28 Oct 2022 05:27:08 -0700 (PDT) From: Akihiko Odaki To: Cc: Alex Williamson , 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 , Akihiko Odaki Subject: [PATCH v5 05/17] e1000e: Omit errp for pci_add_capability Date: Fri, 28 Oct 2022 21:26:17 +0900 Message-Id: <20221028122629.3269-6-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221028122629.3269-1-akihiko.odaki@daynix.com> References: <20221028122629.3269-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::629; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x629.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: 1666960340848100007 Content-Type: text/plain; charset="utf-8" Omitting errp for pci_add_capability() causes it to abort if capabilities overlap. This behavior is appropriate here 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/net/e1000e.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/hw/net/e1000e.c b/hw/net/e1000e.c index ac96f7665a..e433b8f9a5 100644 --- a/hw/net/e1000e.c +++ b/hw/net/e1000e.c @@ -377,17 +377,10 @@ e1000e_gen_dsn(uint8_t *mac) (uint64_t)(mac[0]) << 56; } =20 -static int +static void e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offset, uint16_t pmc) { - Error *local_err =3D NULL; - int ret =3D pci_add_capability(pdev, PCI_CAP_ID_PM, offset, - PCI_PM_SIZEOF, &local_err); - - if (local_err) { - error_report_err(local_err); - return ret; - } + pci_add_capability(pdev, PCI_CAP_ID_PM, offset, PCI_PM_SIZEOF); =20 pci_set_word(pdev->config + offset + PCI_PM_PMC, PCI_PM_CAP_VER_1_1 | @@ -400,8 +393,6 @@ e1000e_add_pm_capability(PCIDevice *pdev, uint8_t offse= t, uint16_t pmc) =20 pci_set_word(pdev->w1cmask + offset + PCI_PM_CTRL, PCI_PM_CTRL_PME_STATUS); - - return ret; } =20 static void e1000e_write_config(PCIDevice *pci_dev, uint32_t address, @@ -480,10 +471,7 @@ static void e1000e_pci_realize(PCIDevice *pci_dev, Err= or **errp) trace_e1000e_msi_init_fail(ret); } =20 - if (e1000e_add_pm_capability(pci_dev, e1000e_pmrb_offset, - PCI_PM_CAP_DSI) < 0) { - hw_error("Failed to initialize PM capability"); - } + e1000e_add_pm_capability(pci_dev, e1000e_pmrb_offset, PCI_PM_CAP_DSI); =20 if (pcie_aer_init(pci_dev, PCI_ERR_VER, e1000e_aer_offset, PCI_ERR_SIZEOF, NULL) < 0) { --=20 2.37.3