[Xen-changelog] [xen-unstable] xend: Fix up check "mac" address sooner change

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

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1277475191 -3600
# Node ID e307aa11ed27ea91cf175461b3a715fe3f7253bc
# Parent  e7b55cc5533aed48a47cf70e20aa9fb991bf2de4
xend: Fix up check "mac" address sooner change

In changeset 21653,
         dev_type = sxp.name(dev_config)
should not have been moved, otherwise, the checking "mac"
paragraph is of no use.

(The original patch as submitted was correct but I had to make the
change manually as it had been mangled.)

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Signed-off-by Chunyan Liu <CYLiu@xxxxxxxxxx>
---
 tools/python/xen/xend/XendDomainInfo.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -r e7b55cc5533a -r e307aa11ed27 tools/python/xen/xend/XendDomainInfo.py
--- a/tools/python/xen/xend/XendDomainInfo.py   Thu Jun 24 12:45:32 2010 +0100
+++ b/tools/python/xen/xend/XendDomainInfo.py   Fri Jun 25 15:13:11 2010 +0100
@@ -833,6 +833,8 @@ class XendDomainInfo:
         @type  dev_config: SXP object (parsed config)
         """
         log.debug("XendDomainInfo.device_create: %s" % 
scrub_password(dev_config))
+        dev_type = sxp.name(dev_config)
+
         if dev_type == 'vif':
             for x in dev_config:
                 if x != 'vif' and x[0] == 'mac':
@@ -840,7 +842,6 @@ class XendDomainInfo:
                         log.error("Virtual network interface creation error - 
invalid MAC Address entered: %s", x[1])
                         raise VmError("Cannot create a new virtual network 
interface - MAC address is not valid!");
 
-        dev_type = sxp.name(dev_config)
         dev_uuid = self.info.device_add(dev_type, cfg_sxp = dev_config)
         dev_config_dict = self.info['devices'][dev_uuid][1]
         log.debug("XendDomainInfo.device_create: %s" % 
scrub_password(dev_config_dict))

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