From patchwork Mon Jun 29 19:25:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 489385 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 591C214076E for ; Tue, 30 Jun 2015 05:31:13 +1000 (AEST) Received: from localhost ([::1]:43691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9elr-0004jx-Ia for incoming@patchwork.ozlabs.org; Mon, 29 Jun 2015 15:31:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9ekG-0002Q9-Ux for qemu-devel@nongnu.org; Mon, 29 Jun 2015 15:29:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z9ekD-0005kd-BM for qemu-devel@nongnu.org; Mon, 29 Jun 2015 15:29:32 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:27680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z9egF-0004iq-DG for qemu-devel@nongnu.org; Mon, 29 Jun 2015 15:25:23 -0400 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t5TJPHeP010810 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 29 Jun 2015 19:25:17 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id t5TJPG1C021768 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 29 Jun 2015 19:25:17 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by userv0122.oracle.com (8.13.8/8.13.8) with ESMTP id t5TJPGiA003876; Mon, 29 Jun 2015 19:25:16 GMT Received: from l.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 29 Jun 2015 12:25:16 -0700 Received: by l.oracle.com (Postfix, from userid 1000) id 734046A026B; Mon, 29 Jun 2015 15:25:15 -0400 (EDT) From: Konrad Rzeszutek Wilk To: stefano.stabellini@eu.citrix.com, xen-devel@lists.xenproject.org, qemu-devel@nongnu.org Date: Mon, 29 Jun 2015 15:25:11 -0400 Message-Id: <1435605913-23826-5-git-send-email-konrad.wilk@oracle.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1435605913-23826-1-git-send-email-konrad.wilk@oracle.com> References: <1435605913-23826-1-git-send-email-konrad.wilk@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 141.146.126.69 Cc: Konrad Rzeszutek Wilk Subject: [Qemu-devel] [PATCH RFC 4/6] xen: Print and use errno where applicable. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In Xen 4.6 commit cd2f100f0f61b3f333d52d1737dd73f02daee592 "libxc: Fix do_memory_op to return negative value on errors" made the libxc API less odd-ball: On errors, return value is -1 and error code is in errno. On success the return value is either 0 or an positive value. Since we could be running with an old toolstack in which the Exx value is in rc or the newer, we print both and return the -EXX depending on rc == -1 condition. Signed-off-by: Konrad Rzeszutek Wilk --- xen-hvm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/xen-hvm.c b/xen-hvm.c index 0408462..a92bc14 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -345,11 +345,12 @@ go_physmap: unsigned long idx = pfn + i; xen_pfn_t gpfn = start_gpfn + i; + /* In Xen 4.6 rc is -1 and errno contains the error value. */ rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { DPRINTF("add_to_physmap MFN %"PRI_xen_pfn" to PFN %" - PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); - return -rc; + PRI_xen_pfn" failed: %d (errno: %d)\n", idx, gpfn, rc, errno); + return rc == -1 ? -errno : -rc; } } @@ -422,11 +423,12 @@ static int xen_remove_from_physmap(XenIOState *state, xen_pfn_t idx = start_addr + i; xen_pfn_t gpfn = phys_offset + i; + /* In Xen 4.6 rc is -1 and errno contains the error value. */ rc = xc_domain_add_to_physmap(xen_xc, xen_domid, XENMAPSPACE_gmfn, idx, gpfn); if (rc) { fprintf(stderr, "add_to_physmap MFN %"PRI_xen_pfn" to PFN %" - PRI_xen_pfn" failed: %d\n", idx, gpfn, rc); - return -rc; + PRI_xen_pfn" failed: %d (errno: %d)\n", idx, gpfn, rc, errno); + return rc == -1 ? -errno : -rc; } }