[Xen-changelog] Cset exclude: bren@xxxxxxxxxxxxxxxxxxxxxxx|ChangeSet|20050426221254|30123

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1388, 2005/04/27 11:35:49+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Cset exclude: 
bren@xxxxxxxxxxxxxxxxxxxxxxx|ChangeSet|20050426221254|30123



 tools/libxc/xc_domain.c  |    2 +-
 xen/common/dom0_ops.c    |    3 +--
 xen/common/dom_mem_ops.c |    3 ---
 3 files changed, 2 insertions(+), 6 deletions(-)


diff -Nru a/tools/libxc/xc_domain.c b/tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c   2005-04-27 07:02:33 -04:00
+++ b/tools/libxc/xc_domain.c   2005-04-27 07:02:33 -04:00
@@ -35,7 +35,7 @@
         goto fail;
 
     if ( (err = do_dom_mem_op(xc_handle, MEMOP_increase_reservation,
-                              NULL, mem_kb/4 + 1, 0, *pdomid)) != (mem_kb/4) )
+                              NULL, mem_kb/4, 0, *pdomid)) != (mem_kb/4) )
     {
         if ( err > 0 )
             errno = ENOMEM;
diff -Nru a/xen/common/dom0_ops.c b/xen/common/dom0_ops.c
--- a/xen/common/dom0_ops.c     2005-04-27 07:02:33 -04:00
+++ b/xen/common/dom0_ops.c     2005-04-27 07:02:33 -04:00
@@ -411,8 +411,7 @@
         d = find_domain_by_id(op->u.setdomainmaxmem.domain);
         if ( d != NULL )
         {
-            d->max_pages = (op->u.setdomainmaxmem.max_memkb +
-                            ((PAGE_SIZE-1)>>10)) >> (PAGE_SHIFT-10);
+            d->max_pages = op->u.setdomainmaxmem.max_memkb >> (PAGE_SHIFT-10);
             put_domain(d);
             ret = 0;
         }
diff -Nru a/xen/common/dom_mem_ops.c b/xen/common/dom_mem_ops.c
--- a/xen/common/dom_mem_ops.c  2005-04-27 07:02:33 -04:00
+++ b/xen/common/dom_mem_ops.c  2005-04-27 07:02:33 -04:00
@@ -61,9 +61,6 @@
             return i;
         }
 
-        /* Initialise the machine-to-phys mapping for this page. */
-        set_machinetophys(page_to_pfn(page), d->tot_pages - 1);
-
         /* Inform the domain of the new page's machine address. */ 
         if ( (extent_list != NULL) && 
              (__put_user(page_to_pfn(page), &extent_list[i]) != 0) )

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