# HG changeset patch
# User emellor@ewan
# Node ID a2d613c125a585773b937bb17d55d40d3700d3ba
# Parent b5ab24152d567f76378c13f9f5d02434d85bbb8e
# Parent 83fe78bb876dfc6d75008c715a772ea2319aae83
Merge.
diff -r b5ab24152d56 -r a2d613c125a5 docs/src/user/installation.tex
--- a/docs/src/user/installation.tex Sat Sep 24 19:41:48 2005
+++ b/docs/src/user/installation.tex Sat Sep 24 21:57:04 2005
@@ -21,6 +21,9 @@
\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;
diff -r b5ab24152d56 -r a2d613c125a5
linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c Sat Sep 24 19:41:48 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/xenbus.c Sat Sep 24 21:57:04 2005
@@ -93,7 +93,8 @@
* 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 @@
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:
diff -r b5ab24152d56 -r a2d613c125a5
linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c Sat Sep 24
19:41:48 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmfront/tpmfront.c Sat Sep 24
21:57:04 2005
@@ -331,7 +331,8 @@
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 @@
}
err = xenbus_transaction_end(0);
+ if (err == EAGAIN)
+ goto again;
if (err) {
xenbus_dev_error(dev, err, "completing transaction");
goto destroy_tpmring;
diff -r b5ab24152d56 -r a2d613c125a5 xen/arch/x86/vmx_vmcs.c
--- a/xen/arch/x86/vmx_vmcs.c Sat Sep 24 19:41:48 2005
+++ b/xen/arch/x86/vmx_vmcs.c Sat Sep 24 21:57:04 2005
@@ -144,10 +144,6 @@
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)
diff -r b5ab24152d56 -r a2d613c125a5 xen/common/grant_table.c
--- a/xen/common/grant_table.c Sat Sep 24 19:41:48 2005
+++ b/xen/common/grant_table.c Sat Sep 24 21:57:04 2005
@@ -83,7 +83,7 @@
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 @@
spin_unlock(&rd->grant_table->lock);
}
-
}
ld->grant_table->maptrack[handle].domid = dom;
diff -r b5ab24152d56 -r a2d613c125a5 tools/check/check_hotplug
--- /dev/null Sat Sep 24 19:41:48 2005
+++ b/tools/check/check_hotplug Sat Sep 24 21:57:04 2005
@@ -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-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home