[Xen-changelog] [xen-unstable] Remove the '-instance' parameter from the qemu device model. Since this parameter

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

# HG changeset patch
# User Ewan Mellor <ewan@xxxxxxxxxxxxx>
# Node ID 97f3368d1dd3160474c290cbc39dfe7c8d0b037f
# Parent  4bac02935c87c92cb72951835fb7b82e83097649
Remove the '-instance' parameter from the qemu device model. Since this 
parameter
is not interpreted by the DM, it actually causes the DM to hang if
passed. Future device model support for the vTPM will read parameters
from the xenstore and won't need the command line parameter(s).
The patch includes a small change to the debugging output for the vTPM
module.

Signed-off-by: Stefan Berger <stefanb@xxxxxxxxxx>
---
 tools/python/xen/xend/image.py        |    4 ----
 tools/python/xen/xend/server/tpmif.py |    2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff -r 4bac02935c87 -r 97f3368d1dd3 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py    Thu Sep 14 07:57:41 2006 +0100
+++ b/tools/python/xen/xend/image.py    Thu Sep 14 08:18:56 2006 +0100
@@ -340,10 +340,6 @@ class HVMImageHandler(ImageHandler):
                            (nics, mac, model))
                 ret.append("-net")
                 ret.append("tap,vlan=%d,bridge=%s" % (nics, bridge))
-            if name == 'vtpm':
-                instance = sxp.child_value(info, 'pref_instance')
-                ret.append("-instance")
-                ret.append("%s" % instance)
         return ret
 
     def configVNC(self, config):
diff -r 4bac02935c87 -r 97f3368d1dd3 tools/python/xen/xend/server/tpmif.py
--- a/tools/python/xen/xend/server/tpmif.py     Thu Sep 14 07:57:41 2006 +0100
+++ b/tools/python/xen/xend/server/tpmif.py     Thu Sep 14 08:18:56 2006 +0100
@@ -52,7 +52,7 @@ class TPMifController(DevController):
         if inst == -1:
             inst = int(sxp.child_value(config, 'instance' , '0'))
 
-        log.info("The domain has a TPM with instance %d and devid %d.",
+        log.info("The domain has a TPM with pref. instance %d and devid %d.",
                  inst, devid)
         back  = { 'pref_instance' : "%i" % inst,
                   'resume'        : "%s" % (self.vm.getResume()) }

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