[Xen-changelog] [xen-unstable] qemu: more verbose on failures.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1195232626 0
# Node ID e948f402c3562af748c3b179f92bd21cb0f2810e
# Parent  03d6d0f96e12d3a3c818709b26a19fb63ca4d09f
qemu: more verbose on failures.
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
 tools/libxc/xc_linux.c  |   17 ++++++++++++-----
 tools/libxc/xc_netbsd.c |   15 ++++++++++-----
 2 files changed, 22 insertions(+), 10 deletions(-)

diff -r 03d6d0f96e12 -r e948f402c356 tools/libxc/xc_linux.c
--- a/tools/libxc/xc_linux.c    Fri Nov 16 17:01:50 2007 +0000
+++ b/tools/libxc/xc_linux.c    Fri Nov 16 17:03:46 2007 +0000
@@ -67,8 +67,10 @@ void *xc_map_foreign_batch(int xc_handle
     privcmd_mmapbatch_t ioctlx;
     void *addr;
     addr = mmap(NULL, num*PAGE_SIZE, prot, MAP_SHARED, xc_handle, 0);
-    if ( addr == MAP_FAILED )
-        return NULL;
+    if ( addr == MAP_FAILED ) {
+        perror("xc_map_foreign_batch: mmap failed");
+        return NULL;
+    }
 
     ioctlx.num=num;
     ioctlx.dom=dom;
@@ -77,7 +79,7 @@ void *xc_map_foreign_batch(int xc_handle
     if ( ioctl(xc_handle, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx) < 0 )
     {
         int saved_errno = errno;
-        perror("XXXXXXXX");
+        perror("xc_map_foreign_batch: ioctl failed");
         (void)munmap(addr, num*PAGE_SIZE);
         errno = saved_errno;
         return NULL;
@@ -94,8 +96,10 @@ void *xc_map_foreign_range(int xc_handle
     privcmd_mmap_entry_t entry;
     void *addr;
     addr = mmap(NULL, size, prot, MAP_SHARED, xc_handle, 0);
-    if ( addr == MAP_FAILED )
-        return NULL;
+    if ( addr == MAP_FAILED ) {
+        perror("xc_map_foreign_range: mmap failed");
+        return NULL;
+    }
 
     ioctlx.num=1;
     ioctlx.dom=dom;
@@ -106,6 +110,7 @@ void *xc_map_foreign_range(int xc_handle
     if ( ioctl(xc_handle, IOCTL_PRIVCMD_MMAP, &ioctlx) < 0 )
     {
         int saved_errno = errno;
+        perror("xc_map_foreign_range: ioctl failed");
         (void)munmap(addr, size);
         errno = saved_errno;
         return NULL;
@@ -402,6 +407,7 @@ void *xc_gnttab_map_grant_ref(int xcg_ha
         int saved_errno = errno;
         struct ioctl_gntdev_unmap_grant_ref unmap_grant;
         /* Unmap the driver slots used to store the grant information. */
+        perror("xc_gnttab_map_grant_ref: mmap failed");
         unmap_grant.index = map.index;
         unmap_grant.count = 1;
         ioctl(xcg_handle, IOCTL_GNTDEV_UNMAP_GRANT_REF, &unmap_grant);
@@ -445,6 +451,7 @@ void *xc_gnttab_map_grant_refs(int xcg_h
         int saved_errno = errno;
         struct ioctl_gntdev_unmap_grant_ref unmap_grant;
         /* Unmap the driver slots used to store the grant information. */
+        perror("xc_gnttab_map_grant_refs: mmap failed");
         unmap_grant.index = map->index;
         unmap_grant.count = count;
         ioctl(xcg_handle, IOCTL_GNTDEV_UNMAP_GRANT_REF, &unmap_grant);
diff -r 03d6d0f96e12 -r e948f402c356 tools/libxc/xc_netbsd.c
--- a/tools/libxc/xc_netbsd.c   Fri Nov 16 17:01:50 2007 +0000
+++ b/tools/libxc/xc_netbsd.c   Fri Nov 16 17:03:46 2007 +0000
@@ -63,8 +63,10 @@ void *xc_map_foreign_batch(int xc_handle
     privcmd_mmapbatch_t ioctlx;
     void *addr;
     addr = mmap(NULL, num*PAGE_SIZE, prot, MAP_ANON | MAP_SHARED, -1, 0);
-    if ( addr == MAP_FAILED )
-        return NULL;
+    if ( addr == MAP_FAILED ) {
+        perror("xc_map_foreign_batch: mmap failed");
+        return NULL;
+    }
 
     ioctlx.num=num;
     ioctlx.dom=dom;
@@ -73,7 +75,7 @@ void *xc_map_foreign_batch(int xc_handle
     if ( ioctl(xc_handle, IOCTL_PRIVCMD_MMAPBATCH, &ioctlx) < 0 )
     {
         int saved_errno = errno;
-        perror("XXXXXXXX");
+        perror("xc_map_foreign_batch: ioctl failed");
         (void)munmap(addr, num*PAGE_SIZE);
         errno = saved_errno;
         return NULL;
@@ -90,8 +92,10 @@ void *xc_map_foreign_range(int xc_handle
     privcmd_mmap_entry_t entry;
     void *addr;
     addr = mmap(NULL, size, prot, MAP_ANON | MAP_SHARED, -1, 0);
-    if ( addr == MAP_FAILED )
-        return NULL;
+    if ( addr == MAP_FAILED ) {
+        perror("xc_map_foreign_range: mmap failed");
+        return NULL;
+    }
 
     ioctlx.num=1;
     ioctlx.dom=dom;
@@ -102,6 +106,7 @@ void *xc_map_foreign_range(int xc_handle
     if ( ioctl(xc_handle, IOCTL_PRIVCMD_MMAP, &ioctlx) < 0 )
     {
         int saved_errno = errno;
+        perror("xc_map_foreign_range: ioctl failed");
         (void)munmap(addr, size);
         errno = saved_errno;
         return NULL;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog