[PATCH] fix 3.3-testing c/s 18434

[PATCH] fix 3.3-testing c/s 18434

[Jim Fehlig]

[-- Attachment #1: Type: text/plain, Size: 423 bytes --]

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>




[-- Attachment #2: 3.3-testing-18434-fix.patch --]
[-- Type: text/x-patch, Size: 710 bytes --]

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,())

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH] fix 3.3-testing c/s 18434

[Keir Fraser]

On 8/10/08 18:47, "Jim Fehlig" <jfehlig@novell.com> wrote:

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

It is in xen-unstable, as c/s 18564 (which is part of
xen-3.3-testing:18434). The bug is a stupid typo, and I will apply your
patch to both trees.

 Thanks,
 Keir

Re: [PATCH] fix 3.3-testing c/s 18434

[Jim Fehlig]

[-- Attachment #1: Type: text/plain, Size: 771 bytes --]

Keir Fraser wrote:
> On 8/10/08 18:47, "Jim Fehlig" <jfehlig@novell.com> wrote:
>
>   
>> 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?
>>     
>
> It is in xen-unstable, as c/s 18564 (which is part of
> xen-3.3-testing:18434).

Missed that, sorry.

I've also found that this c/s causes /local/domain/0/backend/{vkbd, vfb,
console} paths to leak :(.  Patch attached.

Thanks,
Jim

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



[-- Attachment #2: xenstore-leak.patch --]
[-- Type: text/x-patch, Size: 572 bytes --]

diff -r 8cc28137805d tools/python/xen/xend/server/DevController.py
--- a/tools/python/xen/xend/server/DevController.py	Thu Oct 09 11:00:51 2008 +0100
+++ b/tools/python/xen/xend/server/DevController.py	Thu Oct 09 16:00:08 2008 -0600
@@ -257,7 +257,7 @@ class DevController:
 
         if force:
             frontpath = self.frontendPath(dev)
-            backpath = self.readVm(devid, "backend")
+            backpath = xstransact.Read(frontpath, "backend")
             if backpath:
                 xstransact.Remove(backpath)
             xstransact.Remove(frontpath)

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: [PATCH] fix 3.3-testing c/s 18434

[Keir Fraser]

On 9/10/08 23:02, "Jim Fehlig" <jfehlig@novell.com> wrote:

> Missed that, sorry.
> 
> I've also found that this c/s causes /local/domain/0/backend/{vkbd, vfb,
> console} paths to leak :(.  Patch attached.

A major point of the patch was to stop reading the backend link from the
frontend directory. Is the problem that /vm/... is getting deleted too
early? Could we delay it?

 -- Keir

Re: [PATCH] fix 3.3-testing c/s 18434

[Jim Fehlig]

[-- Attachment #1: Type: text/plain, Size: 643 bytes --]

Keir Fraser wrote:
> On 9/10/08 23:02, "Jim Fehlig" <jfehlig@novell.com> wrote:
>
>   
>> Missed that, sorry.
>>
>> I've also found that this c/s causes /local/domain/0/backend/{vkbd, vfb,
>> console} paths to leak :(.  Patch attached.
>>     
>
> A major point of the patch was to stop reading the backend link from the
> frontend directory.

Ah, right.  I should have looked at the patch more closely :-/

>  Is the problem that /vm/... is getting deleted too
> early? Could we delay it?
>   

Turns out that we were just constructing the path incorrectly.  Patch
attached.

Thanks,
Jim


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


[-- Attachment #2: xenstore-path.patch --]
[-- Type: text/x-patch, Size: 562 bytes --]

diff -r 39f6f421eac1 tools/python/xen/xend/server/DevController.py
--- a/tools/python/xen/xend/server/DevController.py	Fri Oct 10 10:15:58 2008 +0100
+++ b/tools/python/xen/xend/server/DevController.py	Fri Oct 10 13:04:54 2008 -0600
@@ -257,7 +257,7 @@ class DevController:
 
         if force:
             frontpath = self.frontendPath(dev)
-            backpath = self.readVm(devid, "backend")
+            backpath = self.readVm(dev, "backend")
             if backpath:
                 xstransact.Remove(backpath)
             xstransact.Remove(frontpath)

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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