From nobody Mon Feb 9 12:25:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499111682852404.8134750661741; Mon, 3 Jul 2017 12:54:42 -0700 (PDT) Received: from localhost ([::1]:37014 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS7Qf-0008Fk-3o for importer@patchew.org; Mon, 03 Jul 2017 15:54:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dS7Hu-0008EQ-3t for qemu-devel@nongnu.org; Mon, 03 Jul 2017 15:45:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dS7Ht-0003EJ-6M for qemu-devel@nongnu.org; Mon, 03 Jul 2017 15:45:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42310) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dS7Hs-0003DN-QV for qemu-devel@nongnu.org; Mon, 03 Jul 2017 15:45:37 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B7C5F40F04; Mon, 3 Jul 2017 19:45:35 +0000 (UTC) Received: from redhat.com (ovpn-120-211.rdu2.redhat.com [10.10.120.211]) by smtp.corp.redhat.com (Postfix) with SMTP id A272618822; Mon, 3 Jul 2017 19:45:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com B7C5F40F04 Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx06.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=mst@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com B7C5F40F04 Date: Mon, 3 Jul 2017 22:45:34 +0300 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1499111049-13721-13-git-send-email-mst@redhat.com> References: <1499111049-13721-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1499111049-13721-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 03 Jul 2017 19:45:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 12/21] i386/kvm/pci-assign: Use errp directly rather than local_err X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Mao Zhongyi , ehabkost@redhat.com, mst@redhat.com, armbru@redhat.com, marcel@redhat.com, pbonzini@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Mao Zhongyi In assigned_device_pci_cap_init(), first, error messages are filled to a local_err variable, then through error_propagate() pass to the parameter of errp. It leads to cumbersome code. In order to avoid the extra local_err and error_propagate(), drop it and use errp instead. Cc: pbonzini@redhat.com Cc: rth@twiddle.net Cc: ehabkost@redhat.com Cc: mst@redhat.com Cc: armbru@redhat.com Cc: marcel@redhat.com Signed-off-by: Mao Zhongyi Reviewed-by: Marcel Apfelbaum Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/i386/kvm/pci-assign.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index b7fdb47..9f2615c 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -1232,7 +1232,6 @@ static int assigned_device_pci_cap_init(PCIDevice *pc= i_dev, Error **errp) AssignedDevice *dev =3D PCI_ASSIGN(pci_dev); PCIRegion *pci_region =3D dev->real_device.regions; int ret, pos; - Error *local_err =3D NULL; =20 /* Clear initial capabilities pointer and status copied from hw */ pci_set_byte(pci_dev->config + PCI_CAPABILITY_LIST, 0); @@ -1251,9 +1250,8 @@ static int assigned_device_pci_cap_init(PCIDevice *pc= i_dev, Error **errp) dev->cap.available |=3D ASSIGNED_DEVICE_CAP_MSI; /* Only 32-bit/no-mask currently supported */ ret =3D pci_add_capability(pci_dev, PCI_CAP_ID_MSI, pos, 10, - &local_err); + errp); if (ret < 0) { - error_propagate(errp, local_err); return ret; } pci_dev->msi_cap =3D pos; @@ -1283,9 +1281,8 @@ static int assigned_device_pci_cap_init(PCIDevice *pc= i_dev, Error **errp) dev->dev.cap_present |=3D QEMU_PCI_CAP_MSIX; dev->cap.available |=3D ASSIGNED_DEVICE_CAP_MSIX; ret =3D pci_add_capability(pci_dev, PCI_CAP_ID_MSIX, pos, 12, - &local_err); + errp); if (ret < 0) { - error_propagate(errp, local_err); return ret; } pci_dev->msix_cap =3D pos; @@ -1313,9 +1310,8 @@ static int assigned_device_pci_cap_init(PCIDevice *pc= i_dev, Error **errp) uint16_t pmc; =20 ret =3D pci_add_capability(pci_dev, PCI_CAP_ID_PM, pos, PCI_PM_SIZ= EOF, - &local_err); + errp); if (ret < 0) { - error_propagate(errp, local_err); return ret; } =20 @@ -1381,9 +1377,8 @@ static int assigned_device_pci_cap_init(PCIDevice *pc= i_dev, Error **errp) } =20 ret =3D pci_add_capability(pci_dev, PCI_CAP_ID_EXP, pos, size, - &local_err); + errp); if (ret < 0) { - error_propagate(errp, local_err); return ret; } =20 @@ -1457,9 +1452,8 @@ static int assigned_device_pci_cap_init(PCIDevice *pc= i_dev, Error **errp) =20 /* Only expose the minimum, 8 byte capability */ ret =3D pci_add_capability(pci_dev, PCI_CAP_ID_PCIX, pos, 8, - &local_err); + errp); if (ret < 0) { - error_propagate(errp, local_err); return ret; } =20 @@ -1485,9 +1479,8 @@ static int assigned_device_pci_cap_init(PCIDevice *pc= i_dev, Error **errp) if (pos) { /* Direct R/W passthrough */ ret =3D pci_add_capability(pci_dev, PCI_CAP_ID_VPD, pos, 8, - &local_err); + errp); if (ret < 0) { - error_propagate(errp, local_err); return ret; } =20 @@ -1503,9 +1496,8 @@ static int assigned_device_pci_cap_init(PCIDevice *pc= i_dev, Error **errp) uint8_t len =3D pci_get_byte(pci_dev->config + pos + PCI_CAP_FLAGS= ); /* Direct R/W passthrough */ ret =3D pci_add_capability(pci_dev, PCI_CAP_ID_VNDR, pos, len, - &local_err); + errp); if (ret < 0) { - error_propagate(errp, local_err); return ret; } =20 --=20 MST