ia64/xen-unstable

changeset 2151:0b883cd8b325

bitkeeper revision 1.1159.1.26 (4117f3c6w3nduQYTDJ5egeudVttQxQ)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk
author iap10@labyrinth.cl.cam.ac.uk
date Mon Aug 09 21:59:34 2004 +0000 (2004-08-09)
parents 5ca8e45604f4 e991e54df4a7
children 92b8c987ae83
files BitKeeper/etc/ignore docs/Makefile docs/xend.tex linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c tools/libxc/xc_linux_restore.c tools/libxc/xc_linux_save.c
line diff
     1.1 --- a/BitKeeper/etc/ignore	Mon Aug 09 18:11:55 2004 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Mon Aug 09 21:59:34 2004 +0000
     1.3 @@ -16,9 +16,11 @@ docs/*.aux
     1.4  docs/*.log
     1.5  docs/*.pdf
     1.6  docs/*.ps
     1.7 +docs/*.dvi
     1.8  docs/*.toc
     1.9  docs/interface/*
    1.10  docs/user/*
    1.11 +docs/xend/*
    1.12  extras/mini-os/h/hypervisor-ifs
    1.13  install
    1.14  install/*
    1.15 @@ -51,4 +53,3 @@ xen/tools/figlet/figlet
    1.16  xen/xen
    1.17  xen/xen-syms
    1.18  xen/xen.*
    1.19 -xen/common/sched_atropos.c.smh
     2.1 --- a/docs/Makefile	Mon Aug 09 18:11:55 2004 +0000
     2.2 +++ b/docs/Makefile	Mon Aug 09 21:59:34 2004 +0000
     2.3 @@ -5,7 +5,7 @@
     2.4  # DOCUMENTS should be a list of the target Postscript files.
     2.5  
     2.6  DOCUMENTS = interface.ps interface.pdf interface.html user.ps \
     2.7 -	    user.pdf user.html
     2.8 +	    user.pdf user.html xend.ps xend.pdf xend.html
     2.9  
    2.10  GFX  = $(patsubst %.obj, %.eps, $(wildcard figs/*.obj))
    2.11  GFX += $(patsubst %.fig, %.eps, $(wildcard figs/*.fig))
     3.1 --- a/docs/xend.tex	Mon Aug 09 18:11:55 2004 +0000
     3.2 +++ b/docs/xend.tex	Mon Aug 09 21:59:34 2004 +0000
     3.3 @@ -123,7 +123,7 @@ to release the devices for exited domain
     3.4  connections and removes the TCP listeners for exited domains.
     3.5  Once all devices have been released it instructs xen to destroy the memory image.
     3.6  
     3.7 -\seb{Domain restart}
     3.8 +\secb{Domain restart}
     3.9  Domain restart is the xen equivalent of a machine reboot. When a domain
    3.10  exits because it has been shutdown in reboot mode, its exit code is reboot.
    3.11  When examining domains to find those that have exited and destroy them,
    3.12 @@ -445,4 +445,4 @@ http://www.openssh.org.
    3.13  http://www.stunnel.org.
    3.14  
    3.15  \end{thebibliography}
    3.16 -\end{document}
    3.17 \ No newline at end of file
    3.18 +\end{document}
     4.1 --- a/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c	Mon Aug 09 18:11:55 2004 +0000
     4.2 +++ b/linux-2.6.7-xen-sparse/drivers/xen/blkfront/blkfront.c	Mon Aug 09 21:59:34 2004 +0000
     4.3 @@ -303,6 +303,26 @@ static void kick_pending_request_queues(
     4.4  }
     4.5  
     4.6  
     4.7 +/* Upon block read completion, issue a dummy machphys update for the
     4.8 +pages in the buffer, just in case we're being migrated. */
     4.9 +
    4.10 +static void blkif_read_completion(struct request *req)
    4.11 +{
    4.12 +	struct bio *bio;
    4.13 +	struct bio_vec *bvec;
    4.14 +	int idx;
    4.15 +	unsigned long mfn, pfn
    4.16 +
    4.17 +	rq_for_each_bio(bio, req) {
    4.18 +		bio_for_each_segment(bvec, bio, idx) {
    4.19 +		    mfn = page_to_phys(bvec->bv_page)>>PAGE_SHIFT;
    4.20 +		    pfn = machine_to_phys_mapping[mfn];
    4.21 +		    queue_machphys_update(mfn, pfn);
    4.22 +		}
    4.23 +	}
    4.24 +}
    4.25 +
    4.26 +
    4.27  static irqreturn_t blkif_int(int irq, void *dev_id, struct pt_regs *ptregs)
    4.28  {
    4.29  	struct request *req;
    4.30 @@ -334,6 +354,9 @@ static irqreturn_t blkif_int(int irq, vo
    4.31  				BUG();
    4.32  
    4.33  			end_that_request_last(req);
    4.34 +
    4.35 +			if( bret->operation == BLKIF_OP_READ )
    4.36 +			    blkif_read_completion( req );
    4.37  			break;
    4.38                  case BLKIF_OP_PROBE:
    4.39                          memcpy(&blkif_control_rsp, bret, sizeof(*bret));
     5.1 --- a/tools/libxc/xc_linux_restore.c	Mon Aug 09 18:11:55 2004 +0000
     5.2 +++ b/tools/libxc/xc_linux_restore.c	Mon Aug 09 21:59:34 2004 +0000
     5.3 @@ -214,7 +214,8 @@ int xc_linux_restore(int xc_handle, XcIO
     5.4      if ( xc_domain_setinitialmem(xc_handle, dom, 
     5.5                                   nr_pfns * (PAGE_SIZE / 1024)) )
     5.6      {
     5.7 -        xcio_error(ioctxt, "Could not set domain initial memory");
     5.8 +        xcio_error(ioctxt, "Could not set domain %d initial memory. pfns=%d, %dKB",
     5.9 +		   dom, nr_pfns,nr_pfns * (PAGE_SIZE / 1024));
    5.10          goto out;
    5.11      }
    5.12  
     6.1 --- a/tools/libxc/xc_linux_save.c	Mon Aug 09 18:11:55 2004 +0000
     6.2 +++ b/tools/libxc/xc_linux_save.c	Mon Aug 09 21:59:34 2004 +0000
     6.3 @@ -632,7 +632,7 @@ int xc_linux_save(int xc_handle, XcIOCon
     6.4                  pfn_batch[batch] = n;
     6.5                  pfn_type[batch] = live_pfn_to_mfn_table[n];
     6.6  
     6.7 -                if( pfn_type[batch] == 0x80000004 ){
     6.8 +                if( pfn_type[batch] == 0x80000001 ){
     6.9                      /* not currently in pusedo-physical map -- set bit
    6.10                         in to_fix that we must send this page in last_iter
    6.11                         unless its sent sooner anyhow */