Merged.

tools/python/xen/xend/XendDomainInfo.py

@@ -1171,11 +1171,6 @@ class XendDomainInfo:
 
             xc.domain_setcpuweight(self.domid, self.info['cpu_weight'])
 
-            m = self.image.getDomainMemory(self.info['memory'] * 1024)
-            balloon.free(m)
-            xc.domain_setmaxmem(self.domid, m)
-            xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
-
             # repin domain vcpus if a restricted cpus list is provided
             # this is done prior to memory allocation to aide in memory
             # distribution for NUMA systems.
@@ -1186,6 +1181,11 @@ class XendDomainInfo:
                     cpu = [ int( cpus[v % len(cpus)] ) ]
                     xc.domain_pincpu(self.domid, v, cpu)
 
+            m = self.image.getDomainMemory(self.info['memory'] * 1024)
+            balloon.free(m)
+            xc.domain_setmaxmem(self.domid, m)
+            xc.domain_memory_increase_reservation(self.domid, m, 0, 0)
+
             self.createChannels()
 
             channel_details = self.image.createImage()

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

@@ -38,10 +38,14 @@ class TPMifController(DevController):
     def getDeviceDetails(self, config):
         """@see DevController.getDeviceDetails"""
 
-        devid = int(sxp.child_value(config, 'pref_instance', '0'))
-        log.info("The domain has a TPM with instance %d." % devid)
+        devid = self.allocateDeviceID()
+        inst = int(sxp.child_value(config, 'pref_instance', '-1'))
+        if inst == -1:
+            inst = int(sxp.child_value(config, 'instance' , '0'))
 
-        back  = { 'pref_instance' : "%i" % devid }
+        log.info("The domain has a TPM with instance %d and devid %d.",
+                 inst, devid)
+        back  = { 'pref_instance' : "%i" % inst }
         front = { 'handle' : "%i" % devid }
 
         return (devid, back, front)