From nobody Wed Feb 11 00:55:41 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=1667264674; cv=none; d=zohomail.com; s=zohoarc; b=fcxvCPDcftFDHY8bho0BnQA1vuYxAN0DL4Ri5tsQNb7w/6+dzG7jIGMk81kTDfqjRhUDa+tb8lYoklqEGxGS7JFZOO34W6vLO06jcdXzF5Zv2B94Dsh+dkhQC4OfGmwbCtuCH6+Ss9HnSJpHa/SIKRwB4LHcbBWUQDnPkosJrM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667264674; 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=GSC2v4ngPUcx+TLSPrzIkvnSf/m2yHNZ/Q2yIIKBef8=; b=Q4eoo53T1y5xXx+yeYnmYHfoYI6rfvJo0cHx/oQrvDhM7xGtmdL+kyLMZ7fjOf0pHApaKr9QBHQIhj/v7Rvg7BZaHSWb2aJQMb5O7AwVFqP7OJADEv1I0mE7EXwd60OUZngkvvjY3SuEBaZUSPabqmMaSetiCxDA0ydGzW8Ce3s= 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 1667264674450199.19199436831445; Mon, 31 Oct 2022 18:04:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opfev-0006cj-96; Mon, 31 Oct 2022 21:01:41 -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 1opfdv-0004u9-3x for qemu-devel@nongnu.org; Mon, 31 Oct 2022 21:00:41 -0400 Received: from mail-pj1-x102c.google.com ([2607:f8b0:4864:20::102c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1opfdp-0006f5-8M for qemu-devel@nongnu.org; Mon, 31 Oct 2022 21:00:35 -0400 Received: by mail-pj1-x102c.google.com with SMTP id k5so4268737pjo.5 for ; Mon, 31 Oct 2022 18:00:31 -0700 (PDT) Received: from fedora.flets-east.jp ([2400:4050:c360:8200:8ae8:3c4:c0da:7419]) by smtp.gmail.com with ESMTPSA id o9-20020aa79789000000b0056d98e359a5sm1875644pfp.165.2022.10.31.18.00.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 18:00:29 -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=GSC2v4ngPUcx+TLSPrzIkvnSf/m2yHNZ/Q2yIIKBef8=; b=zPg8mcCb8j60eFshj7vcV2fOoUH/rHpTX5b/l7+iEUW00SISJzEKHR1UYKpVXcuNJW EjeVJK2B/NBE80HbOoMwmtb6CqD9eI91C3/baO3Dc6tqceTPKxDI86yynNkzHhtCTTFN IAicVRwf+7ONCiqYQP9UJzUoEIDAOnx8tv1iWb6nXg3Dzpfz26kxQACLsieGM+UW6bMz ffi6QcILUBkRlRHxsVxqz2Vgep3D83GnGFhB+k94JFJ9XlVoYOvx2s1SRUp64S2ga74n BYAOEO8OVtkYTYnk8pNS/9r9iVyI0M+RWG4wHxLSfCk6XQic1igUktBlvL7TWqMJqPFo HGGg== 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=GSC2v4ngPUcx+TLSPrzIkvnSf/m2yHNZ/Q2yIIKBef8=; b=WrEdTn+/XP83yUy3c9tqSMscGOjsW/7qDcwWGR3e262U6Nw9fCNjDSo607TQJcll3d x68N6E2+wxroiti8WRBtjaPrVZnYAyC1c1xMbRL+qMYG93Mx7E/c3AuZsyDYGfmo2qs9 Cx/vonHS9X4Q4moQc/pTEQVjx0W7fe2EfwUqqAmikul8nwp+X8kWnjhe7BrzKY607fWE aXhaRO5aO0Mc4GSuz6n27RdRVWAe2JQsEdt0rUjlKdleXZmPKt3pVGDuTR1I6rzDP82b Y+iIqGH++lhR9DbTWPhMS9BH907Pg72+vZSTAUppvrlciaSy3spQE4x6ojI0yKqN95pd dxMA== X-Gm-Message-State: ACrzQf2DFm5b9oG7DZJeZ/Y/pUIcpwEvgrSEGGUeOC2Qu4NU0j0rvKP9 4yXfzJSCb+hohRgbm0RDKY4QgrCiMHm7eCJu X-Google-Smtp-Source: AMsMyM4MBYOnAd6RzBqvpN+WlzlRSr8/7vCM6MIWchXl/rssnSoWJ0OV+lfBSZflyMwPFRAh8LmBsA== X-Received: by 2002:a17:902:f691:b0:186:b250:9767 with SMTP id l17-20020a170902f69100b00186b2509767mr16772957plg.60.1667264430386; Mon, 31 Oct 2022 18:00:30 -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 , Akihiko Odaki Subject: [PATCH v7 16/17] virtio-pci: Omit errp for pci_add_capability Date: Tue, 1 Nov 2022 09:58:58 +0900 Message-Id: <20221101005859.4198-17-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221101005859.4198-1-akihiko.odaki@daynix.com> References: <20221101005859.4198-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::102c; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102c.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: 1667264674898100003 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/virtio/virtio-pci.c | 9 ++------- include/hw/virtio/virtio-pci.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index c37bdc77ea..b393ff01be 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1154,8 +1154,7 @@ static int virtio_pci_add_mem_cap(VirtIOPCIProxy *pro= xy, PCIDevice *dev =3D &proxy->pci_dev; int offset; =20 - offset =3D pci_add_capability(dev, PCI_CAP_ID_VNDR, 0, - cap->cap_len, &error_abort); + offset =3D pci_add_capability(dev, PCI_CAP_ID_VNDR, 0, cap->cap_len); =20 assert(cap->cap_len >=3D sizeof *cap); memcpy(dev->config + offset + PCI_CAP_FLAGS, &cap->cap_len, @@ -1864,11 +1863,7 @@ static void virtio_pci_realize(PCIDevice *pci_dev, E= rror **errp) =20 pcie_endpoint_cap_init(pci_dev, 0); =20 - pos =3D pci_add_capability(pci_dev, PCI_CAP_ID_PM, 0, - PCI_PM_SIZEOF, errp); - if (pos < 0) { - return; - } + pos =3D pci_add_capability(pci_dev, PCI_CAP_ID_PM, 0, PCI_PM_SIZEO= F); =20 pci_dev->exp.pm_cap =3D pos; =20 diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 2446dcd9ae..9f3736723c 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -141,7 +141,7 @@ struct VirtIOPCIProxy { uint32_t msix_bar_idx; uint32_t modern_io_bar_idx; uint32_t modern_mem_bar_idx; - int config_cap; + uint8_t config_cap; uint32_t flags; bool disable_modern; bool ignore_backend_features; --=20 2.38.1