[Xen-ia64-devel] [PATCH] cleanup in xc_ia64_linux_save.c

[Kouya Shimura <kouya@xxxxxxxxxxxxxx>]

xc_ia64_shadow_control() is not needed any more
since xc_shadow_control() was xencommized.

Signed-off-by: Kouya Shimura <kouya@xxxxxxxxxxxxxx>

diff -r 9203ee23e724 tools/libxc/ia64/xc_ia64_linux_save.c
--- a/tools/libxc/ia64/xc_ia64_linux_save.c     Thu Feb 07 11:08:49 2008 -0700
+++ b/tools/libxc/ia64/xc_ia64_linux_save.c     Tue Feb 12 18:09:53 2008 +0900
@@ -50,33 +50,6 @@ static inline void set_bit(int nr, volat
 static inline void set_bit(int nr, volatile void * addr)
 {
     BITMAP_ENTRY(nr, addr) |= (1UL << BITMAP_SHIFT(nr));
-}
-
-static int xc_ia64_shadow_control(int xc_handle,
-                                  uint32_t domid,
-                                  unsigned int sop,
-                                  unsigned long *dirty_bitmap,
-                                  unsigned long pages,
-                                  xc_shadow_op_stats_t *stats)
-{
-    if (dirty_bitmap != NULL && pages > 0) {
-        int i;
-        unsigned char *bmap = (unsigned char *)dirty_bitmap;
-        unsigned long bmap_bytes =
-            ((pages + BITS_PER_LONG - 1) & ~(BITS_PER_LONG - 1)) / 8;
-        unsigned int bmap_pages = (bmap_bytes + PAGE_SIZE - 1) / PAGE_SIZE;
-
-        /* Touch the page so that it is in the TC.
-           FIXME: use a more reliable method.  */
-        for (i = 0 ; i < bmap_pages ; i++)
-            bmap[i * PAGE_SIZE] = 0;
-        /* Because bmap is not page aligned (allocated by malloc), be sure the
-           last page is touched.  */
-        bmap[bmap_bytes - 1] = 0;
-    }
-
-    return xc_shadow_control(xc_handle, domid, sop,
-                             dirty_bitmap, pages, NULL, 0, stats);
 }
 
 static int
@@ -523,9 +496,9 @@ xc_domain_save(int xc_handle, int io_fd,
     /* Domain is still running at this point */
     if (live) {
 
-        if (xc_ia64_shadow_control(xc_handle, dom,
-                                   XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY,
-                                   NULL, 0, NULL ) < 0) {
+        if (xc_shadow_control(xc_handle, dom,
+                              XEN_DOMCTL_SHADOW_OP_ENABLE_LOGDIRTY,
+                              NULL, 0, NULL, 0, NULL ) < 0) {
             ERROR("Couldn't enable shadow mode");
             goto out;
         }
@@ -621,9 +594,10 @@ xc_domain_save(int xc_handle, int io_fd,
            slightly wasteful to peek the whole array evey time,
            but this is fast enough for the moment. */
         if (!last_iter) {
-            if (xc_ia64_shadow_control(xc_handle, dom,
-                                       XEN_DOMCTL_SHADOW_OP_PEEK,
-                                       to_skip, p2m_size, NULL) != p2m_size) {
+            if (xc_shadow_control(xc_handle, dom,
+                                  XEN_DOMCTL_SHADOW_OP_PEEK,
+                                  to_skip, p2m_size,
+                                  NULL, 0, NULL) != p2m_size) {
                 ERROR("Error peeking shadow bitmap");
                 goto out;
             }
@@ -711,9 +685,10 @@ xc_domain_save(int xc_handle, int io_fd,
             }
 
             /* Pages to be sent are pages which were dirty.  */
-            if (xc_ia64_shadow_control(xc_handle, dom,
-                                       XEN_DOMCTL_SHADOW_OP_CLEAN,
-                                       to_send, p2m_size, NULL ) != p2m_size) {
+            if (xc_shadow_control(xc_handle, dom,
+                                  XEN_DOMCTL_SHADOW_OP_CLEAN,
+                                  to_send, p2m_size,
+                                  NULL, 0, NULL ) != p2m_size) {
                 ERROR("Error flushing shadow PT");
                 goto out;
             }
@@ -771,8 +746,9 @@ xc_domain_save(int xc_handle, int io_fd,
  out:
 
     if (live) {
-        if (xc_ia64_shadow_control(xc_handle, dom, XEN_DOMCTL_SHADOW_OP_OFF,
-                                   NULL, 0, NULL ) < 0) {
+        if (xc_shadow_control(xc_handle, dom,
+                              XEN_DOMCTL_SHADOW_OP_OFF,
+                              NULL, 0, NULL, 0, NULL ) < 0) {
             DPRINTF("Warning - couldn't disable shadow mode");
         }
     }

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