[Xen-changelog] Fix the backward compatibility support for using 'vcpus' in the image section of the domain sexp.

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

# HG changeset patch
# User rread@xxxxxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 66260f1a9bdedf30ece59763c360d7ac3e22a035
# Parent  99e7b8f9122e609ee0ced0c669be4f9c9c590091
Fix the backward compatibility support for using 'vcpus' in the image section 
of the domain sexp.

Signed-off-by: Robert Read <robert@xxxxxxxxxxxxx>

diff -r 99e7b8f9122e -r 66260f1a9bde tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Wed Feb  8 23:27:52 2006
+++ b/tools/python/xen/xend/XendDomainInfo.py   Thu Feb  9 02:20:51 2006
@@ -294,7 +294,9 @@
     try:
         if result['image']:
             v = sxp.child_value(result['image'], 'vcpus')
-            if v is not None and int(v) != result['vcpus']:
+            if result['vcpus'] is None and v is not None:
+                result['vcpus'] = int(v)
+            elif v is not None and int(v) != result['vcpus']:
                 log.warn(('Image VCPUs setting overrides vcpus=%d elsewhere.'
                           '  Using %s VCPUs for VM %s.') %
                          (result['vcpus'], v, result['uuid']))

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