From nobody Tue Feb 10 12:59: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=1666852979; cv=none; d=zohomail.com; s=zohoarc; b=KNdJ82QJOXFS22OEqqCrZUOZ199c3wbdu07zMun55ayWnkCGcIhqYUiRaJ/OJOKjRAe4wG3lcEckKWu1egiRmu1lfbpNHneybvf/PIh/6GZl0fRQBQlMvoUIe6GR+9Fcll28O33VcdHDai7+butUlwtLm5uavn+Res/6zVwJlA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666852979; 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=6T08FDbNNqEO12Zwu/jhonyIkuoJ+EhaugR2jE60b2U=; b=QebkawM9D4Mm2isPXGAyLq1yF6wdf8uBY14xmOE6GmKgStaiGeyB5XEaak75Fp0mlKuQHK1jGzWybQTqGUkMHs4YwwtvqKw0r/QAdvuf/mPuZkAfBzNUtqIQVk2ywx6nX0gFrVpC+EMb5TsZtp8r+YNYVhhxa1i4IOaZFYyERhA= 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 1666852979453209.2696609071379; Wed, 26 Oct 2022 23:42:59 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onwYu-0003nI-3f; Thu, 27 Oct 2022 02:40:22 -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 1onwWm-0004BK-GV for qemu-devel@nongnu.org; Thu, 27 Oct 2022 02:38:14 -0400 Received: from mail-pl1-x62f.google.com ([2607:f8b0:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1onwWW-0003DZ-Aa for qemu-devel@nongnu.org; Thu, 27 Oct 2022 02:38:08 -0400 Received: by mail-pl1-x62f.google.com with SMTP id p3so452252pld.10 for ; Wed, 26 Oct 2022 23:37:51 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id z17-20020aa79491000000b0056b818142a2sm448872pfk.109.2022.10.26.23.37.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Oct 2022 23:37:50 -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=6T08FDbNNqEO12Zwu/jhonyIkuoJ+EhaugR2jE60b2U=; b=Oo3z1Mq9iJQSSgDEJQf+9+I62K4uedAU9viS7nGM7MSOYR5BU47hp0yyoNesUiWl3A dQccWhG3aZc4pmucKUeAlNcrgcDOmUsa7t+fI+XJ+9lzXKoDcrtoARuKF1BxwaMDzQwT 8ZMWZb/a9PsP53vi3fLM72m4Iyor4O4GlWSRtnp3JvtZmhsCZAqkJfBRtoSlrxri+gZm xVskmfpKppw1Yh6cTEGKejfX7ehma5oXl6Ogp/GGA1YRoH1B8EGycoOpgou5kOi4nlvK PSGMOSP+p/zkxwwy0tcgqvfRVRIcrRA2NZHSb1rfnv3qht59Urb+QX2YpVsS+UCKwgVW F39Q== 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=6T08FDbNNqEO12Zwu/jhonyIkuoJ+EhaugR2jE60b2U=; b=xb0u8HOqVA9ODFIJDYGnMtRU/Qf39cDreixF0bh5GSOsAcAti86dA05OFJsEc7O1EW AfWh9WuW7cmKiFD+Z/UP+3zExr4+fZ4NOu0HCDRaDbRJOE9OsgCmkAvMSypM+K0sViL9 fCpxDPMsIZupeZn4gNzgruSTIx5AD+VWWrSPxdBePcvlXUCdpfBMAuxbs4wU/m6Uwgts foZtpjiw5GR5TG5L8vCDgH6CW2IBcghBuU7jvPQ1YFcHMqhoVcXJsCDkysUTUvEpQ+TP 65xki/Hmx9KlhcFdwo1b5X7JypKMp16bS/dptJ7ktwadb+lERHZP0ceSD+PGZuJCVqUh eJ4w== X-Gm-Message-State: ACrzQf2qGxjFTp0WPJ1UNFBMVLdKjQ1EN4x9DShBUvOjbsPr/o231llx rMh2SpBpawh/syvV/+9aYzPLPQ== X-Google-Smtp-Source: AMsMyM73cS5dyKUPF6fzMTV+pOZ/zlmHZBdpyTO8prcNC/LBvABRD/oXwD06X9AEljUCU+hDEvYwtg== X-Received: by 2002:a17:90b:1643:b0:212:d286:bb13 with SMTP id il3-20020a17090b164300b00212d286bb13mr8608359pjb.11.1666852671213; Wed, 26 Oct 2022 23:37:51 -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 v4 07/17] hw/nvme: Omit errp for pci_add_capability Date: Thu, 27 Oct 2022 15:36:55 +0900 Message-Id: <20221027063705.4093-8-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221027063705.4093-1-akihiko.odaki@daynix.com> References: <20221027063705.4093-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::62f; envelope-from=akihiko.odaki@daynix.com; helo=mail-pl1-x62f.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, 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: 1666852981458100001 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/nvme/ctrl.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c index 87aeba0564..ff4e2beea6 100644 --- a/hw/nvme/ctrl.c +++ b/hw/nvme/ctrl.c @@ -7325,17 +7325,9 @@ static void nvme_init_sriov(NvmeCtrl *n, PCIDevice *= pci_dev, uint16_t offset) PCI_BASE_ADDRESS_MEM_TYPE_64, bar_size); } =20 -static int nvme_add_pm_capability(PCIDevice *pci_dev, uint8_t offset) +static void nvme_add_pm_capability(PCIDevice *pci_dev, uint8_t offset) { - Error *err =3D NULL; - int ret; - - ret =3D pci_add_capability(pci_dev, PCI_CAP_ID_PM, offset, - PCI_PM_SIZEOF, &err); - if (err) { - error_report_err(err); - return ret; - } + pci_add_capability(pci_dev, PCI_CAP_ID_PM, offset, PCI_PM_SIZEOF); =20 pci_set_word(pci_dev->config + offset + PCI_PM_PMC, PCI_PM_CAP_VER_1_2); @@ -7343,8 +7335,6 @@ static int nvme_add_pm_capability(PCIDevice *pci_dev,= uint8_t offset) PCI_PM_CTRL_NO_SOFT_RESET); pci_set_word(pci_dev->wmask + offset + PCI_PM_CTRL, PCI_PM_CTRL_STATE_MASK); - - return 0; } =20 static int nvme_init_pci(NvmeCtrl *n, PCIDevice *pci_dev, Error **errp) --=20 2.37.3