From mboxrd@z Thu Jan  1 00:00:00 1970
From: Zhigang Wang <zhigang.x.wang@oracle.com>
Subject: [PATCH]Fix XendAPI VM_migrate parameters
Date: Mon, 26 May 2008 09:40:05 +0800
Message-ID: <483A14F5.3040106@oracle.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------060400020900080803090200"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

This is a multi-part message in MIME format.
--------------060400020900080803090200
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Hi,

This patch removes unused resource parameter and fixes the default value for
domain_migrate. Also removes tab indent in XendOptions.py.

Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>

regards,

zhigang

--------------060400020900080803090200
Content-Type: text/x-patch;
 name="xen-fix-xendapi-vm-migrate-param.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="xen-fix-xendapi-vm-migrate-param.patch"

Fix XendAPI VM_migrate parameters

This patch removes unused resource parameter and fixes the default value for
domain_migrate. Also removes tab indent in XendOptions.py.

Signed-off-by: Zhigang Wang <zhigang.x.wang@oracle.com>

diff -Nurap xen-unstable.orig/tools/python/xen/xend/XendAPI.py xen-unstable/tools/python/xen/xend/XendAPI.py
--- xen-unstable.orig/tools/python/xen/xend/XendAPI.py	2008-05-26 09:20:58.000000000 +0800
+++ xen-unstable/tools/python/xen/xend/XendAPI.py	2008-05-26 09:29:19.000000000 +0800
@@ -1759,13 +1759,12 @@ class XendAPI(object):
         xendom = XendDomain.instance()
         xeninfo = xendom.get_vm_by_uuid(vm_ref)
 
-        resource = other_config.get("resource", 0)
         port = other_config.get("port", 0)
-        node = other_config.get("node", 0)
-        ssl = other_config.get("ssl", 0)
+        node = other_config.get("node", -1)
+        ssl = other_config.get("ssl", None)
         
         xendom.domain_migrate(xeninfo.getDomid(), destination_url,
-                              bool(live), resource, port, node, ssl)
+                              bool(live), port, node, ssl)
         return xen_api_success_void()
 
     def VM_save(self, _, vm_ref, dest, checkpoint):
diff -Nurap xen-unstable.orig/tools/python/xen/xend/XendOptions.py xen-unstable/tools/python/xen/xend/XendOptions.py
--- xen-unstable.orig/tools/python/xen/xend/XendOptions.py	2008-05-26 09:20:59.000000000 +0800
+++ xen-unstable/tools/python/xen/xend/XendOptions.py	2008-05-26 09:28:31.000000000 +0800
@@ -222,7 +222,7 @@ class XendOptions:
                                    self.xend_relocation_port_default)
 
     def get_xend_relocation_ssl_port(self):
-	"""Get the port xend listens at for ssl connection to its relocation
+        """Get the port xend listens at for ssl connection to its relocation
         server.
         """
         return self.get_config_int('xend-relocation-ssl-port',

--------------060400020900080803090200
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--------------060400020900080803090200--