[PATCH] tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new

[PATCH] tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new

[ZhouPeng]

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

This pacth clean up vnc options preparing code for xen-upstream-qemu.
Add password option which allows you to use vncpasswd auth by xl.


Signed-off-by: Zhou Peng <zhoupeng@nfs.iscas.ac.cn>

tools/libxl: prepare vnc options for dm_args in
libxl__build_device_model_args_new

diff -r 569abaf2cc12 tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c	Tue Apr 19 13:17:14 2011 +0800
+++ b/tools/libxl/libxl_dm.c	Wed Apr 20 13:47:42 2011 +0800
@@ -208,11 +208,7 @@ static char ** libxl__build_device_model
     if (info->vnc || info->vncdisplay || info->vnclisten || info->vncunused) {
         int display = 0;
         const char *listen = "127.0.0.1";
-
-        if (info->vncpasswd && info->vncpasswd[0]) {
-            assert(!"missing code for supplying vnc password to qemu");
-        }
-        flexarray_append(dm_args, "-vnc");
+        char *vncoptions = NULL;

         if (info->vncdisplay) {
             display = info->vncdisplay;
@@ -224,13 +220,17 @@ static char ** libxl__build_device_model
         }

         if (strchr(listen, ':') != NULL)
-            flexarray_append(dm_args,
-                    libxl__sprintf(gc, "%s%s", listen,
-                        info->vncunused ? ",to=99" : ""));
+            vncoptions = libxl__sprintf(gc,
+                             "%s%s", listen, info->vncunused ? ",to=99" : "");
         else
-            flexarray_append(dm_args,
-                    libxl__sprintf(gc, "%s:%d%s", listen, display,
-                        info->vncunused ? ",to=99" : ""));
+            vncoptions = libxl__sprintf(gc, "%s:%d%s", listen, display,
+                                        info->vncunused ? ",to=99" : "");
+
+        if (info->vncpasswd && info->vncpasswd[0])
+            vncoptions = libxl__sprintf(gc, "%s,password", vncoptions);
+
+        flexarray_append(dm_args, "-vnc");
+        flexarray_append(dm_args, vncoptions);
     }
     if (info->sdl) {
         flexarray_append(dm_args, "-sdl");

-- 
Zhou Peng
Operating System Technology Group
Institute of Software, the Chinese Academy of Sciences (ISCAS)

[-- Attachment #2: tools-libxl-vncoptions.diff --]
[-- Type: text/x-patch, Size: 1968 bytes --]

This pacth clean up vnc options preparing code for xen-upstream-qemu.
Add password option which allows you to use vncpasswd auth by xl.


Signed-off-by: Zhou Peng <zhoupeng@nfs.iscas.ac.cn>

tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new

diff -r 569abaf2cc12 tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c	Tue Apr 19 13:17:14 2011 +0800
+++ b/tools/libxl/libxl_dm.c	Wed Apr 20 13:47:42 2011 +0800
@@ -208,11 +208,7 @@ static char ** libxl__build_device_model
     if (info->vnc || info->vncdisplay || info->vnclisten || info->vncunused) {
         int display = 0;
         const char *listen = "127.0.0.1";
-
-        if (info->vncpasswd && info->vncpasswd[0]) {
-            assert(!"missing code for supplying vnc password to qemu");
-        }
-        flexarray_append(dm_args, "-vnc");
+        char *vncoptions = NULL;
 
         if (info->vncdisplay) {
             display = info->vncdisplay;
@@ -224,13 +220,17 @@ static char ** libxl__build_device_model
         }
 
         if (strchr(listen, ':') != NULL)
-            flexarray_append(dm_args, 
-                    libxl__sprintf(gc, "%s%s", listen,
-                        info->vncunused ? ",to=99" : ""));
+            vncoptions = libxl__sprintf(gc, 
+                             "%s%s", listen, info->vncunused ? ",to=99" : "");
         else
-            flexarray_append(dm_args, 
-                    libxl__sprintf(gc, "%s:%d%s", listen, display,
-                        info->vncunused ? ",to=99" : ""));
+            vncoptions = libxl__sprintf(gc, "%s:%d%s", listen, display,
+                                        info->vncunused ? ",to=99" : "");
+
+        if (info->vncpasswd && info->vncpasswd[0])
+            vncoptions = libxl__sprintf(gc, "%s,password", vncoptions);
+
+        flexarray_append(dm_args, "-vnc");
+        flexarray_append(dm_args, vncoptions);
     }
     if (info->sdl) {
         flexarray_append(dm_args, "-sdl");

[-- 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] tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new

[Stefano Stabellini]

On Wed, 20 Apr 2011, ZhouPeng wrote:
> This pacth clean up vnc options preparing code for xen-upstream-qemu.
> Add password option which allows you to use vncpasswd auth by xl.
> 
> 
> Signed-off-by: Zhou Peng <zhoupeng@nfs.iscas.ac.cn>
> 
> tools/libxl: prepare vnc options for dm_args in
> libxl__build_device_model_args_new


The patch looks OK to me.
Thanks,

Stefano

> 
> diff -r 569abaf2cc12 tools/libxl/libxl_dm.c
> --- a/tools/libxl/libxl_dm.c	Tue Apr 19 13:17:14 2011 +0800
> +++ b/tools/libxl/libxl_dm.c	Wed Apr 20 13:47:42 2011 +0800
> @@ -208,11 +208,7 @@ static char ** libxl__build_device_model
>      if (info->vnc || info->vncdisplay || info->vnclisten || info->vncunused) {
>          int display = 0;
>          const char *listen = "127.0.0.1";
> -
> -        if (info->vncpasswd && info->vncpasswd[0]) {
> -            assert(!"missing code for supplying vnc password to qemu");
> -        }
> -        flexarray_append(dm_args, "-vnc");
> +        char *vncoptions = NULL;
> 
>          if (info->vncdisplay) {
>              display = info->vncdisplay;
> @@ -224,13 +220,17 @@ static char ** libxl__build_device_model
>          }
> 
>          if (strchr(listen, ':') != NULL)
> -            flexarray_append(dm_args,
> -                    libxl__sprintf(gc, "%s%s", listen,
> -                        info->vncunused ? ",to=99" : ""));
> +            vncoptions = libxl__sprintf(gc,
> +                             "%s%s", listen, info->vncunused ? ",to=99" : "");
>          else
> -            flexarray_append(dm_args,
> -                    libxl__sprintf(gc, "%s:%d%s", listen, display,
> -                        info->vncunused ? ",to=99" : ""));
> +            vncoptions = libxl__sprintf(gc, "%s:%d%s", listen, display,
> +                                        info->vncunused ? ",to=99" : "");
> +
> +        if (info->vncpasswd && info->vncpasswd[0])
> +            vncoptions = libxl__sprintf(gc, "%s,password", vncoptions);
> +
> +        flexarray_append(dm_args, "-vnc");
> +        flexarray_append(dm_args, vncoptions);
>      }
>      if (info->sdl) {
>          flexarray_append(dm_args, "-sdl");

Re: [PATCH] tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new

[ZhouPeng]

Thanks.

2011/4/20 Stefano Stabellini <stefano.stabellini@eu.citrix.com>:
> On Wed, 20 Apr 2011, ZhouPeng wrote:
>> This pacth clean up vnc options preparing code for xen-upstream-qemu.
>> Add password option which allows you to use vncpasswd auth by xl.
>>
>>
>> Signed-off-by: Zhou Peng <zhoupeng@nfs.iscas.ac.cn>
>>
>> tools/libxl: prepare vnc options for dm_args in
>> libxl__build_device_model_args_new
>
>
> The patch looks OK to me.
> Thanks,
>
> Stefano
>
>>
>> diff -r 569abaf2cc12 tools/libxl/libxl_dm.c
>> --- a/tools/libxl/libxl_dm.c  Tue Apr 19 13:17:14 2011 +0800
>> +++ b/tools/libxl/libxl_dm.c  Wed Apr 20 13:47:42 2011 +0800
>> @@ -208,11 +208,7 @@ static char ** libxl__build_device_model
>>      if (info->vnc || info->vncdisplay || info->vnclisten || info->vncunused) {
>>          int display = 0;
>>          const char *listen = "127.0.0.1";
>> -
>> -        if (info->vncpasswd && info->vncpasswd[0]) {
>> -            assert(!"missing code for supplying vnc password to qemu");
>> -        }
>> -        flexarray_append(dm_args, "-vnc");
>> +        char *vncoptions = NULL;
>>
>>          if (info->vncdisplay) {
>>              display = info->vncdisplay;
>> @@ -224,13 +220,17 @@ static char ** libxl__build_device_model
>>          }
>>
>>          if (strchr(listen, ':') != NULL)
>> -            flexarray_append(dm_args,
>> -                    libxl__sprintf(gc, "%s%s", listen,
>> -                        info->vncunused ? ",to=99" : ""));
>> +            vncoptions = libxl__sprintf(gc,
>> +                             "%s%s", listen, info->vncunused ? ",to=99" : "");
>>          else
>> -            flexarray_append(dm_args,
>> -                    libxl__sprintf(gc, "%s:%d%s", listen, display,
>> -                        info->vncunused ? ",to=99" : ""));
>> +            vncoptions = libxl__sprintf(gc, "%s:%d%s", listen, display,
>> +                                        info->vncunused ? ",to=99" : "");
>> +
>> +        if (info->vncpasswd && info->vncpasswd[0])
>> +            vncoptions = libxl__sprintf(gc, "%s,password", vncoptions);
>> +
>> +        flexarray_append(dm_args, "-vnc");
>> +        flexarray_append(dm_args, vncoptions);
>>      }
>>      if (info->sdl) {
>>          flexarray_append(dm_args, "-sdl");
>
>



-- 
Zhou Peng
Operating System Technology Group
Institute of Software, the Chinese Academy of Sciences (ISCAS)

Re: [PATCH] tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new

[Ian Jackson]

ZhouPeng writes ("[Xen-devel] [PATCH] tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new"):
> This pacth clean up vnc options preparing code for xen-upstream-qemu.
> Add password option which allows you to use vncpasswd auth by xl.

How does the new qemu actually find out what the password is ?  AFAICT
from the current code, it is only written to xenstore.  Does the new
qemu read it from there like the old one ?

Ian.

Re: [PATCH] tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new

[ZhouPeng]

2011/5/9 Ian Jackson <Ian.Jackson@eu.citrix.com>:
> ZhouPeng writes ("[Xen-devel] [PATCH] tools/libxl: prepare vnc options for dm_args in libxl__build_device_model_args_new"):
>> This pacth clean up vnc options preparing code for xen-upstream-qemu.
>> Add password option which allows you to use vncpasswd auth by xl.
>
> How does the new qemu actually find out what the password is ?  AFAICT
> from the current code, it is only written to xenstore.
Yes, it is only writen to xenstore for new qemu
> Does the new qemu read it from there like the old one ?
New qemu hasn't implemented it yet, but I have send a patch named
[xen-upstream-qemu: get vncpassword through xenstore, enable
VNC_AUTH_VNC] [http://patchwork.ozlabs.org/patch/92372/] to this
mail-list before which was cced to you.
That patch allows to read vncpasswd through xenstore in new qemu.

In the discussion, Stefano Stabellini suggest to use QMP to
communicate vncpasswd.

Thanks,
> Ian.
>



-- 
Zhou Peng
Operating System Technology Group
Institute of Software, the Chinese Academy of Sciences (ISCAS)