[Xen-changelog] [xen-unstable] xenpaging: do not use DPRINTF/ERROR if xch handle is unavailable

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

# HG changeset patch
# User Olaf Hering <olaf@xxxxxxxxx>
# Date 1292352649 0
# Node ID 688ec201e7c719c95c6f95787e0655ac68c73a9d
# Parent  13f0549597cb7a9ab56a587e09e756245678ce0a
xenpaging: do not use DPRINTF/ERROR if xch handle is unavailable

Fix DPRINTF/ERROR usage. Both macros reference a xch variable in local scope.
If xc_interface_open fails and after xc_interface_close, both can not be used
anymore. Use standard fprintf for this case.

Remove the code to print the exit value, its not really useful.
Its a left-over for debugging from an earlier patch.

Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 tools/xenpaging/xenpaging.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff -r 13f0549597cb -r 688ec201e7c7 tools/xenpaging/xenpaging.c
--- a/tools/xenpaging/xenpaging.c       Tue Dec 14 18:50:16 2010 +0000
+++ b/tools/xenpaging/xenpaging.c       Tue Dec 14 18:50:49 2010 +0000
@@ -539,7 +539,7 @@ int main(int argc, char *argv[])
     paging = xenpaging_init(&xch, domain_id);
     if ( paging == NULL )
     {
-        ERROR("Error initialising paging");
+        fprintf(stderr, "Error initialising paging");
         return 1;
     }
 
@@ -688,12 +688,10 @@ int main(int argc, char *argv[])
     /* Tear down domain paging */
     rc1 = xenpaging_teardown(xch, paging);
     if ( rc1 != 0 )
-        ERROR("Error tearing down paging");
+        fprintf(stderr, "Error tearing down paging");
 
     if ( rc == 0 )
         rc = rc1;
-
-    DPRINTF("xenpaging exit code %d\n", rc);
     return rc;
 }
 

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