[PATCH] Fix vnc-dryrun option interaction

[PATCH] Fix vnc-dryrun option interaction

[George Washington Dunlap III]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 740 bytes --]

A patch that was applied yesterday tried to turn the vnc option off if 
dryrun was set.  Unfortunately, the way it was actually coded turned 
vnc ON if dryrun was not set!  I think this patch should fix it (someone 
who actually uses vnc & dryrun should test it, though).

  -George

+-------------------+----------------------------------------
| dunlapg@umich.edu | http://www-personal.umich.edu/~dunlapg 
+-------------------+----------------------------------------
|  Who could move a mountain, who could love their enemy?
|  Who could rejoice in pain, and turn the other cheek?
|	- Rich Mullins, "Surely God is With Us"
+------------------------------------------------------------
| Outlaw Junk Email! Support HR 1748 (www.cauce.org)

[-- Attachment #2: Type: TEXT/PLAIN, Size: 685 bytes --]

diff -urN --exclude=SCCS --exclude=BitKeeper xen-unstable.latest/tools/python/xen/xm/create.py xeno-ft/tools/python/xen/xm/create.py
--- xen-unstable.latest/tools/python/xen/xm/create.py	2005-06-23 08:47:36.000000000 -0400
+++ xeno-ft/tools/python/xen/xm/create.py	2005-06-23 10:14:14.000000000 -0400
@@ -618,7 +618,8 @@
         config = opts.vals.config
     else:
         opts.load_defconfig()
-        opts.vals.vnc = not opts.vals.dryrun
+	if opts.vals.dryrun:
+	    opts.vals.vnc = 0;
         preprocess(opts, opts.vals)
         if not opts.getopt('name') and opts.getopt('defconfig'):
             opts.setopt('name', os.path.basename(opts.getopt('defconfig')))

[-- 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 vnc-dryrun option interaction

[Keir Fraser]

On 23 Jun 2005, at 15:23, George Washington Dunlap III wrote:

> A patch that was applied yesterday tried to turn the vnc option off if 
> dryrun was set.  Unfortunately, the way it was actually coded turned 
> vnc ON if dryrun was not set!  I think this patch should fix it 
> (someone who actually uses vnc & dryrun should test it, though).
>
>  -George

That patch was originally from Arun Sharma at Intel. I've cc'ed him.

  -- Keir

Re: [PATCH] Fix vnc-dryrun option interaction

[Arun Sharma]

Keir Fraser wrote:
> On 23 Jun 2005, at 15:23, George Washington Dunlap III wrote:
> 
>> A patch that was applied yesterday tried to turn the vnc option off if 
>> dryrun was set.  Unfortunately, the way it was actually coded turned 
>> vnc ON if dryrun was not set!  I think this patch should fix it 
>> (someone who actually uses vnc & dryrun should test it, though).
>>
>>  -George
> 
> 
> That patch was originally from Arun Sharma at Intel. I've cc'ed him.

Please apply this patch. It fixes two problems:

- vnc shouldn't be turned on by default (I didn't spot it because I 
usually have VNC on)

- If it's a boolean, its stringified version seen by xend would be 
"True" or "False". An integer is easier to parse in xend. A patch that I 
have in my queue expects it to be an integer.

	-Arun

Re: [PATCH] Fix vnc-dryrun option interaction

[Keir Fraser]

On 23 Jun 2005, at 17:57, Arun Sharma wrote:

> Please apply this patch. It fixes two problems:

The patch is missing. :-)

  -- Keir

Re: [PATCH] Fix vnc-dryrun option interaction

[Arun Sharma]

Keir Fraser wrote:
> 
> On 23 Jun 2005, at 17:57, Arun Sharma wrote:
> 
>> Please apply this patch. It fixes two problems:
> 
> 
> The patch is missing. :-)

I meant the patch George posted :)

	-Arun

Re: [PATCH] Fix vnc-dryrun option interaction

[Arun Sharma]

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

Arun Sharma wrote:
> Keir Fraser wrote:
> 
>>
>> On 23 Jun 2005, at 17:57, Arun Sharma wrote:
>>
>>> Please apply this patch. It fixes two problems:
>>
>>
>>
>> The patch is missing. :-)
> 
> 
> I meant the patch George posted :)

There's a problem with that patch.

I think this patch is better. With George's patch (and my original 
patch) xm create -n shows (vnc 0), even when vnc=1 in the config file.

	-Arun

[-- Attachment #2: novnc-dryrun2.patch --]
[-- Type: text/plain, Size: 513 bytes --]

diff -r 3b939e817833 tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py	Thu Jun 23 16:38:32 2005
+++ b/tools/python/xen/xm/create.py	Thu Jun 23 13:30:06 2005
@@ -545,7 +545,7 @@
     """If vnc was specified, spawn a vncviewer in listen mode
     and pass its address to the domain on the kernel command line.
     """
-    if not vals.vnc: return
+    if not vals.vnc or vals.dryrun: return
     vnc_display = choose_vnc_display()
     if not vnc_display:
         opts.warn("No free vnc display")

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

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