[Xen-changelog] First step to network infrastructure, add a type to XenDomain to identify

[Xen staging patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User stekloff@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 47dede68bbeddc66ba75209fac74fa595fb27662
# Parent  51484df99be1195e07d06021dabb414167993c40
First step to network infrastructure, add a type to XenDomain to identify
it as HVM or PV rather than using the config time option. The forthcoming
XenNetDevice will need to check. This is also the first step toward running
PV and HVM domains at the same time.

Signed-off-by: Daniel Stekloff <dsteklof@xxxxxxxxxx>
---
 tools/xm-test/lib/XmTestLib/XenDomain.py |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff -r 51484df99be1 -r 47dede68bbed tools/xm-test/lib/XmTestLib/XenDomain.py
--- a/tools/xm-test/lib/XmTestLib/XenDomain.py  Thu May 04 14:19:19 2006 +0100
+++ b/tools/xm-test/lib/XmTestLib/XenDomain.py  Thu May 04 14:20:11 2006 +0100
@@ -193,6 +193,12 @@ class XenDomain:
             self.name = getUniqueName()
 
         self.config = config
+        # Set domain type, either PV for ParaVirt domU or HVM for 
+        # FullVirt domain
+        if ENABLE_HVM_SUPPORT:
+            self.type = "HVM"
+        else:
+            self.type = "PV"
 
     def start(self):
 
@@ -203,6 +209,10 @@ class XenDomain:
                               extra=output,
                               errorcode=ret)
 
+        # HVM domains require waiting for boot
+        if self.getDomainType() == "HVM":
+            waitForBoot()
+
     def stop(self):
         prog = "xm"
         cmd = " shutdown "
@@ -224,6 +234,9 @@ class XenDomain:
 
     def getId(self):
         return domid(self.getName());
+
+    def getDomainType(self):
+        return self.type
 
 
 class XmTestDomain(XenDomain):
@@ -246,11 +259,6 @@ class XmTestDomain(XenDomain):
 
         XenDomain.__init__(self, config.getOpt("name"), config=config)
 
-    def start(self):
-        XenDomain.start(self)
-        if ENABLE_HVM_SUPPORT:
-            waitForBoot()
-
     def minSafeMem(self):
         return 32
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog