# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxxxxx>
# Date 1170335703 0
# Node ID 6e81102d29be5c688c0e77c9ef3303c677264e91
# Parent 7b72e2536065ac4181ac9f95d124686ac421f9c5
# Parent 2e80cd715047352fd8c524abb8dcb8a53646714b
Merge
---
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 5 +++--
tools/libxc/xc_linux_save.c | 2 --
tools/xm-test/lib/XmTestLib/XenDomain.py | 3 +++
tools/xm-test/tests/vtpm/09_vtpm-xapi.py | 3 +--
4 files changed, 7 insertions(+), 6 deletions(-)
diff -r 7b72e2536065 -r 6e81102d29be
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Thu Feb 01
13:14:43 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Thu Feb 01
13:15:03 2007 +0000
@@ -1935,8 +1935,6 @@ static struct net_device * __devinit cre
np = netdev_priv(netdev);
np->xbdev = dev;
- netif_carrier_off(netdev);
-
spin_lock_init(&np->tx_lock);
spin_lock_init(&np->rx_lock);
@@ -1991,6 +1989,9 @@ static struct net_device * __devinit cre
SET_NETDEV_DEV(netdev, &dev->dev);
np->netdev = netdev;
+
+ netif_carrier_off(netdev);
+
return netdev;
exit_free_tx:
diff -r 7b72e2536065 -r 6e81102d29be tools/libxc/xc_linux_save.c
--- a/tools/libxc/xc_linux_save.c Thu Feb 01 13:14:43 2007 +0000
+++ b/tools/libxc/xc_linux_save.c Thu Feb 01 13:15:03 2007 +0000
@@ -536,8 +536,6 @@ static int canonicalize_pagetable(unsign
if (!MFN_IS_IN_PSEUDOPHYS_MAP(mfn)) {
/* This will happen if the type info is stale which
is quite feasible under live migration */
- DPRINTF("PT Race: [%08lx,%d] pte=%llx, mfn=%08lx\n",
- type, i, (unsigned long long)pte, mfn);
pfn = 0; /* zap it - we'll retransmit this page later */
race = 1; /* inform the caller of race; fatal if !live */
} else
diff -r 7b72e2536065 -r 6e81102d29be tools/xm-test/lib/XmTestLib/XenDomain.py
--- a/tools/xm-test/lib/XmTestLib/XenDomain.py Thu Feb 01 13:14:43 2007 +0000
+++ b/tools/xm-test/lib/XmTestLib/XenDomain.py Thu Feb 01 13:15:03 2007 +0000
@@ -31,6 +31,9 @@ from XenDevice import *
from XenDevice import *
from DomainTracking import *
from acm import *
+
+
+DOM0_UUID = "00000000-0000-0000-0000-000000000000"
def getDefaultKernel():
diff -r 7b72e2536065 -r 6e81102d29be tools/xm-test/tests/vtpm/09_vtpm-xapi.py
--- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py Thu Feb 01 13:14:43 2007 +0000
+++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py Thu Feb 01 13:15:03 2007 +0000
@@ -13,7 +13,6 @@ from XmTestLib import xapi
from XmTestLib import xapi
from XmTestLib.XenAPIDomain import XmTestAPIDomain
from XmTestLib import *
-from xen.xend import XendDomain
from vtpm_utils import *
import commands
import os
@@ -28,7 +27,7 @@ vm_uuid = domain.get_uuid()
vm_uuid = domain.get_uuid()
vtpmcfg = {}
-vtpmcfg['backend'] = XendDomain.DOM0_UUID
+vtpmcfg['backend'] = DOM0_UUID
vtpmcfg['VM'] = vm_uuid
session = xapi.connect()
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home