Merge.

docs/src/user/installation.tex

@@ -21,6 +21,9 @@ required if you wish to build from source.
 \item [$\dag$] The \path{iproute2} package.
 \item [$\dag$] The Linux bridge-utils\footnote{Available from {\tt
       http://bridge.sourceforge.net}} (e.g., \path{/sbin/brctl})
+\item [$\dag$] The Linux hotplug system\footnote{Available from {\tt
+      http://linux-hotplug.sourceforge.net/}} (e.g., \path{/sbin/hotplug}
+      and related scripts)
 \item [$\dag$] An installation of Twisted~v1.3 or
   above\footnote{Available from {\tt http://www.twistedmatrix.com}}.
   There may be a binary package available for your distribution;

linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c

@@ -93,7 +93,8 @@ static void frontend_changed(struct xenbus_watch *watch, const char *node)
 	 * Tell the front-end that we are ready to go -
 	 * unless something bad happens
 	 */
-	err = xenbus_transaction_start(be->dev->nodename);
+again:
+	err = xenbus_transaction_start();
 	if (err) {
 		xenbus_dev_error(be->dev, err, "starting transaction");
 		return;
@@ -127,7 +128,14 @@ static void frontend_changed(struct xenbus_watch *watch, const char *node)
 		goto abort;
 	}
 
-	xenbus_transaction_end(0);
+	err = xenbus_transaction_end(0);
+	if (err == EAGAIN)
+		goto again;
+	if (err) {
+		xenbus_dev_error(be->dev, err, "end of transaction");
+		goto abort;
+	}
+
 	xenbus_dev_ok(be->dev);
 	return;
 abort:

linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c

@@ -331,7 +331,8 @@ static int talk_to_backend(struct xenbus_device *dev,
 		goto out;
 	}
 
-	err = xenbus_transaction_start(dev->nodename);
+again:
+	err = xenbus_transaction_start();
 	if (err) {
 		xenbus_dev_error(dev, err, "starting transaction");
 		goto destroy_tpmring;
@@ -363,6 +364,8 @@ static int talk_to_backend(struct xenbus_device *dev,
 	}
 
 	err = xenbus_transaction_end(0);
+	if (err == EAGAIN)
+		goto again;
 	if (err) {
 		xenbus_dev_error(dev, err, "completing transaction");
 		goto destroy_tpmring;

tools/check/check_hotplug

@@ -0,0 +1,10 @@
+#!/bin/bash
+# CHECK-INSTALL
+
+function error {
+   echo
+   echo '  *** Check for the hotplug scripts (hotplug) FAILED'
+   exit 1
+}
+
+which hotplug 1>/dev/null 2>&1 || error

xen/arch/x86/vmx_vmcs.c

@@ -144,10 +144,6 @@ static void vmx_setup_platform(struct vcpu *v, struct cpu_user_regs *regs)
     e820_map_nr = *(p + E820_MAP_NR_OFFSET);
     e820entry = (struct e820entry *)(p + E820_MAP_OFFSET);
 
-#ifndef NDEBUG
-    print_e820_memory_map(e820entry, n);
-#endif
-
     for ( i = 0; i < e820_map_nr; i++ )
     {
         if (e820entry[i].type == E820_SHARED_PAGE)

xen/common/grant_table.c

@@ -83,7 +83,7 @@ __gnttab_map_grant_ref(
     int            handle;
     u64            addr;
     unsigned long  frame = 0;
-    int            rc;
+    int            rc = GNTST_okay;
     active_grant_entry_t *act;
 
     /* Entry details from @rd's shared grant table. */
@@ -377,7 +377,6 @@ __gnttab_map_grant_ref(
 
             spin_unlock(&rd->grant_table->lock);
         }
-
     }
 
     ld->grant_table->maptrack[handle].domid         = dom;