[Pkg-xen-devel] Bug#481200: xend: Handle unspecified timer_mode domain platform parameter.

[Marco Sinhoreli]

Package: xen-3
Severity: important
Tags: patch


Cheers,

Marco Sinhoreli

-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.18.8-xen (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
-------------- next part --------------
--- xen-3-3.2.0.old/tools/python/xen/xend/XendDomainInfo.py	2008-01-18 15:31:10.000000000 -0200
+++ xen-3-3.2.0/tools/python/xen/xend/XendDomainInfo.py	2008-05-14 10:22:15.000000000 -0300
@@ -1650,9 +1650,10 @@
         self._recreateDom()
 
         # Set timer configration of domain
-        if hvm:
+        timer_mode = self.info["platform"].get("timer_mode")
+        if hvm and timer_mode is not None:
             xc.hvm_set_param(self.domid, HVM_PARAM_TIMER_MODE,
-                long(self.info["platform"].get("timer_mode")))
+                             long(timer_mode))
 
         # Set maximum number of vcpus in domain
         xc.domain_max_vcpus(self.domid, int(self.info['VCPUs_max']))