Merge.

tools/python/xen/util/process.py

@@ -24,6 +24,8 @@ def runscript(cmd):
         r = p.poll()
         for (fd, event) in r:
             if event == select.POLLHUP:
+                cout.close()
+                cerr.close()
                 return stdout
             if fd == cout.fileno():
                 stdout = stdout + cout.readline()

tools/python/xen/xend/image.py

@@ -324,7 +324,7 @@ class VmxImageHandler(ImageHandler):
     # xm config file
     def parseDeviceModelArgs(self, imageConfig, deviceConfig):
         dmargs = [ 'cdrom', 'boot', 'fda', 'fdb',
-                   'localtime', 'serial', 'stdvga', 'isa' ] 
+                   'localtime', 'serial', 'stdvga', 'isa', 'vcpus' ] 
         ret = []
         for a in dmargs:
             v = sxp.child_value(imageConfig, a)

tools/python/xen/xend/server/blkif.py

@@ -42,7 +42,7 @@ class BlkifController(DevController):
         
         typedev = sxp.child_value(config, 'dev')
         if re.match('^ioemu:', typedev):
-            return
+            return (0,{},{})
 
         devid = blkif.blkdev_name_to_number(sxp.child_value(config, 'dev'))
 

tools/python/xen/xend/server/tpmif.py

@@ -39,7 +39,7 @@ class TPMifController(DevController):
         """@see DevController.getDeviceDetails"""
         
         devid = int(sxp.child_value(config, 'instance', '0'))
-        log.error("The domain has a TPM with instance %d." % devid)
+        log.debug("The domain has a TPM with instance %d." % devid)
 
         back  = { 'instance' : "%i" % devid }
         front = { 'handle' : "%i" % devid }

tools/python/xen/xm/create.py

@@ -496,7 +496,7 @@ def configure_vfr(opts, config, vals):
 def configure_vmx(opts, config_image, vals):
     """Create the config for VMX devices.
     """
-    args = [ 'memmap', 'device_model', 'cdrom',
+    args = [ 'memmap', 'device_model', 'vcpus', 'cdrom',
              'boot', 'fda', 'fdb', 'localtime', 'serial', 'macaddr', 'stdvga', 
              'isa', 'nographic', 'vnc', 'vncviewer', 'sdl', 'display']
     for a in args: