ia64/xen-unstable

changeset 7058:a2d613c125a5

Merge.
author emellor@ewan
date Sat Sep 24 22:57:04 2005 +0100 (2005-09-24)
parents b5ab24152d56 83fe78bb876d
children 74b05ac4706f
files docs/src/user/installation.tex linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c tools/check/check_hotplug xen/arch/x86/vmx_vmcs.c xen/common/grant_table.c
line diff
     1.1 --- a/docs/src/user/installation.tex	Sat Sep 24 20:41:48 2005 +0100
     1.2 +++ b/docs/src/user/installation.tex	Sat Sep 24 22:57:04 2005 +0100
     1.3 @@ -21,6 +21,9 @@ required if you wish to build from sourc
     1.4  \item [$\dag$] The \path{iproute2} package.
     1.5  \item [$\dag$] The Linux bridge-utils\footnote{Available from {\tt
     1.6        http://bridge.sourceforge.net}} (e.g., \path{/sbin/brctl})
     1.7 +\item [$\dag$] The Linux hotplug system\footnote{Available from {\tt
     1.8 +      http://linux-hotplug.sourceforge.net/}} (e.g., \path{/sbin/hotplug}
     1.9 +      and related scripts)
    1.10  \item [$\dag$] An installation of Twisted~v1.3 or
    1.11    above\footnote{Available from {\tt http://www.twistedmatrix.com}}.
    1.12    There may be a binary package available for your distribution;
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c	Sat Sep 24 20:41:48 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c	Sat Sep 24 22:57:04 2005 +0100
     2.3 @@ -93,7 +93,8 @@ static void frontend_changed(struct xenb
     2.4  	 * Tell the front-end that we are ready to go -
     2.5  	 * unless something bad happens
     2.6  	 */
     2.7 -	err = xenbus_transaction_start(be->dev->nodename);
     2.8 +again:
     2.9 +	err = xenbus_transaction_start();
    2.10  	if (err) {
    2.11  		xenbus_dev_error(be->dev, err, "starting transaction");
    2.12  		return;
    2.13 @@ -127,7 +128,14 @@ static void frontend_changed(struct xenb
    2.14  		goto abort;
    2.15  	}
    2.16  
    2.17 -	xenbus_transaction_end(0);
    2.18 +	err = xenbus_transaction_end(0);
    2.19 +	if (err == EAGAIN)
    2.20 +		goto again;
    2.21 +	if (err) {
    2.22 +		xenbus_dev_error(be->dev, err, "end of transaction");
    2.23 +		goto abort;
    2.24 +	}
    2.25 +
    2.26  	xenbus_dev_ok(be->dev);
    2.27  	return;
    2.28  abort:
     3.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Sat Sep 24 20:41:48 2005 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c	Sat Sep 24 22:57:04 2005 +0100
     3.3 @@ -331,7 +331,8 @@ static int talk_to_backend(struct xenbus
     3.4  		goto out;
     3.5  	}
     3.6  
     3.7 -	err = xenbus_transaction_start(dev->nodename);
     3.8 +again:
     3.9 +	err = xenbus_transaction_start();
    3.10  	if (err) {
    3.11  		xenbus_dev_error(dev, err, "starting transaction");
    3.12  		goto destroy_tpmring;
    3.13 @@ -363,6 +364,8 @@ static int talk_to_backend(struct xenbus
    3.14  	}
    3.15  
    3.16  	err = xenbus_transaction_end(0);
    3.17 +	if (err == EAGAIN)
    3.18 +		goto again;
    3.19  	if (err) {
    3.20  		xenbus_dev_error(dev, err, "completing transaction");
    3.21  		goto destroy_tpmring;
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/tools/check/check_hotplug	Sat Sep 24 22:57:04 2005 +0100
     4.3 @@ -0,0 +1,10 @@
     4.4 +#!/bin/bash
     4.5 +# CHECK-INSTALL
     4.6 +
     4.7 +function error {
     4.8 +   echo
     4.9 +   echo '  *** Check for the hotplug scripts (hotplug) FAILED'
    4.10 +   exit 1
    4.11 +}
    4.12 +
    4.13 +which hotplug 1>/dev/null 2>&1 || error
     5.1 --- a/xen/arch/x86/vmx_vmcs.c	Sat Sep 24 20:41:48 2005 +0100
     5.2 +++ b/xen/arch/x86/vmx_vmcs.c	Sat Sep 24 22:57:04 2005 +0100
     5.3 @@ -144,10 +144,6 @@ static void vmx_setup_platform(struct vc
     5.4      e820_map_nr = *(p + E820_MAP_NR_OFFSET);
     5.5      e820entry = (struct e820entry *)(p + E820_MAP_OFFSET);
     5.6  
     5.7 -#ifndef NDEBUG
     5.8 -    print_e820_memory_map(e820entry, n);
     5.9 -#endif
    5.10 -
    5.11      for ( i = 0; i < e820_map_nr; i++ )
    5.12      {
    5.13          if (e820entry[i].type == E820_SHARED_PAGE)
     6.1 --- a/xen/common/grant_table.c	Sat Sep 24 20:41:48 2005 +0100
     6.2 +++ b/xen/common/grant_table.c	Sat Sep 24 22:57:04 2005 +0100
     6.3 @@ -83,7 +83,7 @@ static int
     6.4      int            handle;
     6.5      u64            addr;
     6.6      unsigned long  frame = 0;
     6.7 -    int            rc;
     6.8 +    int            rc = GNTST_okay;
     6.9      active_grant_entry_t *act;
    6.10  
    6.11      /* Entry details from @rd's shared grant table. */
    6.12 @@ -377,7 +377,6 @@ static int
    6.13  
    6.14              spin_unlock(&rd->grant_table->lock);
    6.15          }
    6.16 -
    6.17      }
    6.18  
    6.19      ld->grant_table->maptrack[handle].domid         = dom;