From nobody Tue Feb 10 19:49: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@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1666960100; cv=none; d=zohomail.com; s=zohoarc; b=Xq3VrS+RbrrqnzynZvo7FssBFL9hJpCbc0NZtT8IFVLFCvuZ4By5yfeGEkAGQ9a/SEcAf3iMRmnlFj4+w0g1i4Hi31Tu8q80RE50ERU0rxwrLVXULWsNQaOy309j2+T5COZo9lu7nVj47DoLvCqUtP1uM1GrCYiJ5qB6cIll7Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666960100; 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=S/wVlNiEldgDVjsPjh0ol+nUZbcUyoFeavu4L0KDtJI=; b=nujv8ChQiZjgAgQ+rnFiYm7fVk0HIMJNKGyu93uY9vLyIs8/3l39s4w34MFaIa+RdlmKLcmMIJSLXXxpxNbH/+Xy+7P42o4Rzwl6jvypXpzGiungbnz6FEMRrT/1V6jWrA+H8ARQMldfuPGSxv2FUKITyLK2SQ1+v++LQ6oi6gU= 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 166696010055570.17131975902373; Fri, 28 Oct 2022 05:28:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ooOSt-0003Ss-JK; Fri, 28 Oct 2022 08:27:59 -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 1ooORw-0002mU-2Q for qemu-devel@nongnu.org; Fri, 28 Oct 2022 08:27:03 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ooORu-0003GQ-FY for qemu-devel@nongnu.org; Fri, 28 Oct 2022 08:26:59 -0400 Received: by mail-pj1-x102a.google.com with SMTP id d13-20020a17090a3b0d00b00213519dfe4aso4338901pjc.2 for ; Fri, 28 Oct 2022 05:26:58 -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.26.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Oct 2022 05:26:57 -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=S/wVlNiEldgDVjsPjh0ol+nUZbcUyoFeavu4L0KDtJI=; b=3z4/8xJ9y0+B4jY+BM+RJ9hwQj2SjyBNTSQZXND9sKmsjo3kKXxnQptVJKeYsR22/8 H6XJ8exyzQELkxDASLCjFcHb1s27PykZfP0HzJiYWJJxpHd1nxySUPU1ksF4RM57f7Jn sdy/alNPlC27gGWhD27aDy0KfmQYdvuk3/k2LwlagNEHzL4VESk2uCVDFzhpwhetjOZi lr1eq4DG2/WyTnpnfGx/XeueK5L7UibIZ0bd+HFfBPoHbLXlEGzs4NLzblsby+No8bO8 JQk7DwUzCxHzBE2Yo2o2Mpfep/pupPYrOn/H9KzeVzeC7Siny94bF0oG+LLzT9f77z2x h60w== 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=S/wVlNiEldgDVjsPjh0ol+nUZbcUyoFeavu4L0KDtJI=; b=F0s5EiVv/7QqkFMxB2j5xKPqjqO3+zlOIWEEo25AvtNtV56VPQ41yXzTK1us+ZD5hz uPXQa7X/rh5rGXOS3tOHwk7z9L+FCli+BoP8GUtKOx6U/xPLI7WNPcs9OkrokM0x6lSU hhVL3kYXIYQkvm4ns2Xtv+htzXWm91oK5eaLIdBjSt0xOsOPQCugZsgTQ6nnB3sbBNQ4 N0eyEVY0foq2OO4JyTSoCzMqMNuzladoXrX6MOmgQ1Cp8J04EV+9o1p/PO8l67dUgNhi Vf/gAXfcVM9PxkZHf+c3sPw0Ok992p5h99aTU1XEd19EDmy8Tb1hQaaIIg6OJGhfG3u/ xpig== X-Gm-Message-State: ACrzQf1WYDmuBq32wZHzAEfhk70wFnlxTPUn3NFwo1Ccav/IzYgDbdDa ejKEDiRVjVqAl/Kk0bS11bVpGg== X-Google-Smtp-Source: AMsMyM4tThzk7L0yrYFAcZ0SQwsKT0v2bg1lVZ8kTZPQN1ubkf8V1o6Xy9D7PUqQSgsdUT61Oie13Q== X-Received: by 2002:a17:903:11c3:b0:178:aec1:189c with SMTP id q3-20020a17090311c300b00178aec1189cmr54170068plh.136.1666960017741; Fri, 28 Oct 2022 05:26:57 -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 03/17] hw/i386/amd_iommu: Omit errp for pci_add_capability Date: Fri, 28 Oct 2022 21:26:15 +0900 Message-Id: <20221028122629.3269-4-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::102a; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102a.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=ham 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: 1666960101078100003 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/i386/amd_iommu.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c index 725f69095b..8a88cbea0a 100644 --- a/hw/i386/amd_iommu.c +++ b/hw/i386/amd_iommu.c @@ -1539,7 +1539,6 @@ static void amdvi_sysbus_reset(DeviceState *dev) =20 static void amdvi_sysbus_realize(DeviceState *dev, Error **errp) { - int ret =3D 0; AMDVIState *s =3D AMD_IOMMU_DEVICE(dev); MachineState *ms =3D MACHINE(qdev_get_machine()); PCMachineState *pcms =3D PC_MACHINE(ms); @@ -1553,23 +1552,11 @@ static void amdvi_sysbus_realize(DeviceState *dev, = Error **errp) if (!qdev_realize(DEVICE(&s->pci), &bus->qbus, errp)) { return; } - ret =3D pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC, 0, - AMDVI_CAPAB_SIZE, errp); - if (ret < 0) { - return; - } - s->capab_offset =3D ret; + s->capab_offset =3D pci_add_capability(&s->pci.dev, AMDVI_CAPAB_ID_SEC= , 0, + AMDVI_CAPAB_SIZE); =20 - ret =3D pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, - AMDVI_CAPAB_REG_SIZE, errp); - if (ret < 0) { - return; - } - ret =3D pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, - AMDVI_CAPAB_REG_SIZE, errp); - if (ret < 0) { - return; - } + pci_add_capability(&s->pci.dev, PCI_CAP_ID_MSI, 0, AMDVI_CAPAB_REG_SIZ= E); + pci_add_capability(&s->pci.dev, PCI_CAP_ID_HT, 0, AMDVI_CAPAB_REG_SIZE= ); =20 /* Pseudo address space under root PCI bus. */ x86ms->ioapic_as =3D amdvi_host_dma_iommu(bus, s, AMDVI_IOAPIC_SB_DEVI= D); --=20 2.37.3