From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jim Fehlig <jfehlig@novell.com>
Subject: [PATCH] fix 3.3-testing c/s 18434
Date: Wed, 08 Oct 2008 11:47:49 -0600
Message-ID: <48ECF245.4080707@novell.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------060600050102010006030309"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/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/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.
--------------060600050102010006030309
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

c/s 18434 in xen-3.3-testing has a hunk that changes gatherDom() to
_gatherDom() in tools/python/xen/xend/image.py.  There is no such
method, thus simple "xm list" fails

jfehlig4: # xm li
Error: _gatherDom
Usage: xm list [options] [Domain, ...]
..

Trivial fix attached.  BTW, I don't see this patch in xen-unstable.  Why
is this only in xen3.3-testing?

Thanks,
Jim

    Signed-off-by: Jim Fehlig <jfehlig@novell.com>




--------------060600050102010006030309
Content-Type: text/x-patch;
 name="3.3-testing-18434-fix.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="3.3-testing-18434-fix.patch"

diff -r e0e17216ba70 tools/python/xen/xend/image.py
--- a/tools/python/xen/xend/image.py	Thu Oct 02 10:42:38 2008 +0100
+++ b/tools/python/xen/xend/image.py	Wed Oct 08 11:39:05 2008 -0600
@@ -502,7 +502,7 @@ class ImageHandler:
         if fifo_fd >= 0:
             self._openSentinel(sentinel_path_fifo)
             os.close(fifo_fd)
-            self.pid = self.vm._gatherDom(('image/device-model-pid', int))
+            self.pid = self.vm.gatherDom(('image/device-model-pid', int))
             log.debug("%s device model rediscovered, pid %s sentinel fifo %s",
                     name, self.pid, sentinel_path_fifo)
             self.sentinel_thread = thread.start_new_thread(self._sentinel_watch,())

--------------060600050102010006030309
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

--------------060600050102010006030309--