ia64/xen-unstable

changeset 11476:97f3368d1dd3

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@us.ibm.com>
author Ewan Mellor <ewan@xensource.com>
date Thu Sep 14 08:18:56 2006 +0100 (2006-09-14)
parents 4bac02935c87
children 0008fca70351
files tools/python/xen/xend/image.py tools/python/xen/xend/server/tpmif.py
line diff
     1.1 --- a/tools/python/xen/xend/image.py	Thu Sep 14 07:57:41 2006 +0100
     1.2 +++ b/tools/python/xen/xend/image.py	Thu Sep 14 08:18:56 2006 +0100
     1.3 @@ -340,10 +340,6 @@ class HVMImageHandler(ImageHandler):
     1.4                             (nics, mac, model))
     1.5                  ret.append("-net")
     1.6                  ret.append("tap,vlan=%d,bridge=%s" % (nics, bridge))
     1.7 -            if name == 'vtpm':
     1.8 -                instance = sxp.child_value(info, 'pref_instance')
     1.9 -                ret.append("-instance")
    1.10 -                ret.append("%s" % instance)
    1.11          return ret
    1.12  
    1.13      def configVNC(self, config):
     2.1 --- a/tools/python/xen/xend/server/tpmif.py	Thu Sep 14 07:57:41 2006 +0100
     2.2 +++ b/tools/python/xen/xend/server/tpmif.py	Thu Sep 14 08:18:56 2006 +0100
     2.3 @@ -52,7 +52,7 @@ class TPMifController(DevController):
     2.4          if inst == -1:
     2.5              inst = int(sxp.child_value(config, 'instance' , '0'))
     2.6  
     2.7 -        log.info("The domain has a TPM with instance %d and devid %d.",
     2.8 +        log.info("The domain has a TPM with pref. instance %d and devid %d.",
     2.9                   inst, devid)
    2.10          back  = { 'pref_instance' : "%i" % inst,
    2.11                    'resume'        : "%s" % (self.vm.getResume()) }