[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 4/6] xen: Print and use errno where applicable.
From: |
Konrad Rzeszutek Wilk |
Subject: |
[Qemu-devel] [PATCH RFC 4/6] xen: Print and use errno where applicable. |
Date: |
Mon, 29 Jun 2015 15:25:11 -0400 |
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 <address@hidden>
---
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;
}
}
--
2.1.0
- [Qemu-devel] [PATCH RFC v1] Cleanups + various fixes due to libxl ABI + more logging on errors., Konrad Rzeszutek Wilk, 2015/06/29
- [Qemu-devel] [PATCH RFC 5/6] xen/pt/msi: Add the register value when printing logging and error messages, Konrad Rzeszutek Wilk, 2015/06/29
- [Qemu-devel] [PATCH RFC 3/6] xen/pt: xen_host_pci_config_read returns -errno, not -1 on failure, Konrad Rzeszutek Wilk, 2015/06/29
- [Qemu-devel] [PATCH RFC 4/6] xen: Print and use errno where applicable.,
Konrad Rzeszutek Wilk <=
- [Qemu-devel] [PATCH RFC 2/6] xen/pt: Make xen_pt_msi_set_enable static, Konrad Rzeszutek Wilk, 2015/06/29
- [Qemu-devel] [PATCH RFC 6/6] xen: Add backtrace for serious issues., Konrad Rzeszutek Wilk, 2015/06/29
- [Qemu-devel] [PATCH RFC 1/6] xen/pt: Update comments with proper function name., Konrad Rzeszutek Wilk, 2015/06/29