ia64/xen-unstable

changeset 4665:bb65a9270780

bitkeeper revision 1.1385.1.3 (426f6b05kK8EBkiTLCXBeJZCPG2ZgQ)

Cset exclude: bren@br260.wolfson.cam.ac.uk|ChangeSet|20050426221254|30123
author kaf24@firebug.cl.cam.ac.uk
date Wed Apr 27 10:35:49 2005 +0000 (2005-04-27)
parents a6945f416cd0
children b73324fab5b1
files tools/libxc/xc_domain.c xen/common/dom0_ops.c xen/common/dom_mem_ops.c
line diff
     1.1 --- a/tools/libxc/xc_domain.c	Tue Apr 26 22:12:54 2005 +0000
     1.2 +++ b/tools/libxc/xc_domain.c	Wed Apr 27 10:35:49 2005 +0000
     1.3 @@ -35,7 +35,7 @@ int xc_domain_create(int xc_handle,
     1.4          goto fail;
     1.5  
     1.6      if ( (err = do_dom_mem_op(xc_handle, MEMOP_increase_reservation,
     1.7 -                              NULL, mem_kb/4 + 1, 0, *pdomid)) != (mem_kb/4) )
     1.8 +                              NULL, mem_kb/4, 0, *pdomid)) != (mem_kb/4) )
     1.9      {
    1.10          if ( err > 0 )
    1.11              errno = ENOMEM;
     2.1 --- a/xen/common/dom0_ops.c	Tue Apr 26 22:12:54 2005 +0000
     2.2 +++ b/xen/common/dom0_ops.c	Wed Apr 27 10:35:49 2005 +0000
     2.3 @@ -411,8 +411,7 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
     2.4          d = find_domain_by_id(op->u.setdomainmaxmem.domain);
     2.5          if ( d != NULL )
     2.6          {
     2.7 -            d->max_pages = (op->u.setdomainmaxmem.max_memkb +
     2.8 -                            ((PAGE_SIZE-1)>>10)) >> (PAGE_SHIFT-10);
     2.9 +            d->max_pages = op->u.setdomainmaxmem.max_memkb >> (PAGE_SHIFT-10);
    2.10              put_domain(d);
    2.11              ret = 0;
    2.12          }
     3.1 --- a/xen/common/dom_mem_ops.c	Tue Apr 26 22:12:54 2005 +0000
     3.2 +++ b/xen/common/dom_mem_ops.c	Wed Apr 27 10:35:49 2005 +0000
     3.3 @@ -61,9 +61,6 @@ alloc_dom_mem(struct domain *d,
     3.4              return i;
     3.5          }
     3.6  
     3.7 -        /* Initialise the machine-to-phys mapping for this page. */
     3.8 -        set_machinetophys(page_to_pfn(page), d->tot_pages - 1);
     3.9 -
    3.10          /* Inform the domain of the new page's machine address. */ 
    3.11          if ( (extent_list != NULL) && 
    3.12               (__put_user(page_to_pfn(page), &extent_list[i]) != 0) )