direct-io.hg

changeset 13767:6e81102d29be

Merge
author Tim Deegan <Tim.Deegan@xensource.com>
date Thu Feb 01 13:15:03 2007 +0000 (2007-02-01)
parents 7b72e2536065 2e80cd715047
children f45de0fe8a15 1c7efb60176c
files
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Feb 01 13:14:43 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c	Thu Feb 01 13:15:03 2007 +0000
     1.3 @@ -1935,8 +1935,6 @@ static struct net_device * __devinit cre
     1.4  	np                   = netdev_priv(netdev);
     1.5  	np->xbdev            = dev;
     1.6  
     1.7 -	netif_carrier_off(netdev);
     1.8 -
     1.9  	spin_lock_init(&np->tx_lock);
    1.10  	spin_lock_init(&np->rx_lock);
    1.11  
    1.12 @@ -1991,6 +1989,9 @@ static struct net_device * __devinit cre
    1.13  	SET_NETDEV_DEV(netdev, &dev->dev);
    1.14  
    1.15  	np->netdev = netdev;
    1.16 +
    1.17 +	netif_carrier_off(netdev);
    1.18 +
    1.19  	return netdev;
    1.20  
    1.21   exit_free_tx:
     2.1 --- a/tools/libxc/xc_linux_save.c	Thu Feb 01 13:14:43 2007 +0000
     2.2 +++ b/tools/libxc/xc_linux_save.c	Thu Feb 01 13:15:03 2007 +0000
     2.3 @@ -536,8 +536,6 @@ static int canonicalize_pagetable(unsign
     2.4              if (!MFN_IS_IN_PSEUDOPHYS_MAP(mfn)) {
     2.5                  /* This will happen if the type info is stale which
     2.6                     is quite feasible under live migration */
     2.7 -                DPRINTF("PT Race: [%08lx,%d] pte=%llx, mfn=%08lx\n",
     2.8 -                        type, i, (unsigned long long)pte, mfn);
     2.9                  pfn  = 0;  /* zap it - we'll retransmit this page later */
    2.10                  race = 1;  /* inform the caller of race; fatal if !live */ 
    2.11              } else
     3.1 --- a/tools/xm-test/lib/XmTestLib/XenDomain.py	Thu Feb 01 13:14:43 2007 +0000
     3.2 +++ b/tools/xm-test/lib/XmTestLib/XenDomain.py	Thu Feb 01 13:15:03 2007 +0000
     3.3 @@ -33,6 +33,9 @@ from DomainTracking import *
     3.4  from acm import *
     3.5  
     3.6  
     3.7 +DOM0_UUID = "00000000-0000-0000-0000-000000000000"
     3.8 +
     3.9 +
    3.10  def getDefaultKernel():
    3.11      return arch.getDefaultKernel()
    3.12  
     4.1 --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py	Thu Feb 01 13:14:43 2007 +0000
     4.2 +++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py	Thu Feb 01 13:15:03 2007 +0000
     4.3 @@ -13,7 +13,6 @@
     4.4  from XmTestLib import xapi
     4.5  from XmTestLib.XenAPIDomain import XmTestAPIDomain
     4.6  from XmTestLib import *
     4.7 -from xen.xend import XendDomain
     4.8  from vtpm_utils import *
     4.9  import commands
    4.10  import os
    4.11 @@ -28,7 +27,7 @@ except Exception, e:
    4.12  vm_uuid = domain.get_uuid()
    4.13  
    4.14  vtpmcfg = {}
    4.15 -vtpmcfg['backend'] = XendDomain.DOM0_UUID
    4.16 +vtpmcfg['backend'] = DOM0_UUID
    4.17  vtpmcfg['VM'] = vm_uuid
    4.18  
    4.19  session = xapi.connect()