[Xen-changelog] [xen-unstable] libxc, tmem: Fix build after fd2e5008c2e0

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

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1284394621 -3600
# Node ID 258b93411302284ab6dc52a2068425e00ab7c911
# Parent  fd2e5008c2e042581158f71d351b92b9670f90ae
libxc, tmem: Fix build after fd2e5008c2e0

Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/libxc/xc_tmem.c |    6 +++---
 tools/libxc/xenctrl.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -r fd2e5008c2e0 -r 258b93411302 tools/libxc/xc_tmem.c
--- a/tools/libxc/xc_tmem.c     Mon Sep 13 17:11:04 2010 +0100
+++ b/tools/libxc/xc_tmem.c     Mon Sep 13 17:17:01 2010 +0100
@@ -81,7 +81,7 @@ int xc_tmem_control(xc_interface *xch,
         memset(buf, 0, arg1);
 #endif
 
-    rc = do_tmem_op(xc, &op);
+    rc = do_tmem_op(xch, &op);
 
     if (subop == TMEMC_LIST) {
         if (arg1 != 0)
@@ -91,7 +91,7 @@ int xc_tmem_control(xc_interface *xch,
     return rc;
 }
 
-int xc_tmem_control_oid(int xc,
+int xc_tmem_control_oid(xc_interface *xch,
                         int32_t pool_id,
                         uint32_t subop,
                         uint32_t cli_id,
@@ -463,7 +463,7 @@ int xc_tmem_restore(xc_interface *xch, i
             if ( read_exact(io_fd, buf, pagesize) )
                 return -1;
             checksum += *buf;
-            if ( (rc = xc_tmem_control_oid(xc, pool_id,
+            if ( (rc = xc_tmem_control_oid(xch, pool_id,
                                            TMEMC_RESTORE_PUT_PAGE, dom,
                                            bufsize, index, oid, buf)) <= 0 )
             {
diff -r fd2e5008c2e0 -r 258b93411302 tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h     Mon Sep 13 17:11:04 2010 +0100
+++ b/tools/libxc/xenctrl.h     Mon Sep 13 17:17:01 2010 +0100
@@ -1458,7 +1458,7 @@ struct tmem_oid {
     uint64_t oid[3];
 };
 
-int xc_tmem_control_oid(int xc, int32_t pool_id, uint32_t subop,
+int xc_tmem_control_oid(xc_interface *xch, int32_t pool_id, uint32_t subop,
                         uint32_t cli_id, uint32_t arg1, uint32_t arg2,
                         struct tmem_oid oid, void *buf);
 int xc_tmem_control(xc_interface *xch,

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