WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] XendConfig to_sxp optional domain

To: xen-devel@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] XendConfig to_sxp optional domain
From: Alexey Tumanov <atumanov@xxxxxxxxx>
Date: Wed, 13 May 2009 17:35:07 -0700
Delivery-date: Wed, 13 May 2009 17:43:30 -0700
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=O+A+OLRzEwuRS4x4gNVCLzdhETO1EBVUysHIe8JBl2Q=; b=bvcXr4Vg+2pL9skv+mHcqIc2H2kqk8+ieJ5oNVjKJpgazimpggq3TznWwG32A27AEM VaHQSrMCwoeZ11c1cSZwjKENcMEyJCZcVqiritkyoKemGJf/lUcHwvN6mLam/GuWYxrD 2D06LFjQAWdCd/Z5tNPesOX95cgfBVFiw5T5Y=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=Cqezm61h/fvjoMLfGegiEP2F+lpzeS6uIF21YrU9/h97mGqrQv7EdcExWphPdzlSZY mGHb2eH3a+tegyD5JNk7oSbhMfiZlIhQMiUGPu0KsBxTceACbhBjfkhr22Cg6osoCSid KSPDfFYwINCGvhmXgYMan5k3WaLmAP6qgw8HY=
Envelope-to: www-data@xxxxxxxxxxxxxxxxxxx
In-reply-to: <2453e2900905131429u35a6951ud4ee1b09e4cfbacd@xxxxxxxxxxxxxx>
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
References: <2453e2900905131429u35a6951ud4ee1b09e4cfbacd@xxxxxxxxxxxxxx>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
Hi,

I think I came across a tiny bug (please confirm) in to_sxp method of
XendConfig class (tools/python/xen/xend/XendConfig.py):
   def to_sxp(self, domain = None, ignore_devices = False, ignore = [],
              legacy_only = True):
the domain is optional, but the code tries to access its methods in
several places.  I was just wondering whether there's a strong
assumption that domain should be specified, or the extra checks really
are necessary.

Here's a patch.
Thanks,
Alex.

--- a/tools/python/xen/xend/XendConfig.py       Mon May 11 13:52:04 2009 +0100
+++ b/tools/python/xen/xend/XendConfig.py       Wed May 13 17:23:17 2009 -0400
@@ -1035,7 +1035,7 @@ class XendConfig(dict):
        # TODO: domid/dom is the same thing but called differently
        #       depending if it is from xenstore or sxpr.

-        if domain.getDomid() is not None:
+        if domain and domain.getDomid() != None:
            sxpr.append(['domid', domain.getDomid()])

        if not legacy_only:
@@ -1072,12 +1072,13 @@ class XendConfig(dict):
            sxpr.append(['security_label', self['security_label']])

        sxpr.append(['image', self.image_sxpr()])
-        sxpr.append(['status', domain._stateGet()])
-
-        if domain.getDomid() is not None:
-            sxpr.append(['state', self._get_old_state_string()])

        if domain:
+            sxpr.append(['status', domain._stateGet()])
+
+            if domain.getDomid() is not None:
+                sxpr.append(['state', self._get_old_state_string()])
+
            if domain.store_mfn:
                sxpr.append(['store_mfn', domain.store_mfn])
            if domain.console_mfn:

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

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] XendConfig to_sxp optional domain, Alexey Tumanov <=