From nobody Wed Nov 5 15:47:05 2025 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 1497276112033349.990350352572; Mon, 12 Jun 2017 07:01:52 -0700 (PDT) Received: from localhost ([::1]:38233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKPub-0001j6-0R for importer@patchew.org; Mon, 12 Jun 2017 10:01:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKPjq-0000qp-O2 for qemu-devel@nongnu.org; Mon, 12 Jun 2017 09:50:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKPjp-0008RV-Kg for qemu-devel@nongnu.org; Mon, 12 Jun 2017 09:50:38 -0400 Received: from [59.151.112.132] (port=55865 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKPjp-0008Q5-9X for qemu-devel@nongnu.org; Mon, 12 Jun 2017 09:50:37 -0400 Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 12 Jun 2017 21:50:30 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id B5D7E47C7C69; Mon, 12 Jun 2017 21:50:27 +0800 (CST) Received: from maozy.g08.fujitsu.local (10.167.225.76) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 12 Jun 2017 21:50:27 +0800 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="19936605" From: Mao Zhongyi To: Date: Mon, 12 Jun 2017 21:48:35 +0800 Message-ID: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.167.225.76] X-yoursite-MailScanner-ID: B5D7E47C7C69.A3FE0 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: maozy.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH v5 9/9] 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: pbonzini@redhat.com, mst@redhat.com, ehabkost@redhat.com, armbru@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" 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 Signed-off-by: Mao Zhongyi --- 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 2.9.3