Re: [PATCH]tools/libxl: fix a bug in libxl__build_device_model_args_new. info->vncpasswd can't be empty if info->vncpasswd != NULL

[ZhouPeng <zpengxen@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 2631 bytes --]

This patch may be more readable
==
Signed-off-by: Zhou Peng <zhoupeng@nfs.iscas.ac.cn>

tools/libxl: fix a bug in libxl__build_device_model_args_new.
info->vncpasswd can't be empty if info->vncpasswd != NULL

diff -r 3f00c5faa12a tools/libxl/libxl_dm.c
--- a/tools/libxl/libxl_dm.c    Wed Apr 13 16:10:26 2011 +0100
+++ b/tools/libxl/libxl_dm.c    Fri Apr 15 09:45:43 2011 +0800
@@ -209,7 +209,7 @@ static char ** libxl__build_device_model
         int display = 0;
         const char *listen = "127.0.0.1";

-        if (info->vncpasswd && info->vncpasswd[0]) {
+        if (info->vncpasswd && (info->vncpasswd[0] == '\0')) {
             assert(!"missing code for supplying vnc password to qemu");
         }
         flexarray_append(dm_args, "-vnc");

2011/4/15 ZhouPeng <zpengxen@gmail.com>

>
>
> 2011/4/15 Christoph Egger <Christoph.Egger@amd.com>
>
>> On 04/15/11 11:36, ZhouPeng wrote:
>>
>>>
>>>
>>> 2011/4/15 Christoph Egger<Christoph.Egger@amd.com<mailto:
>>> Christoph.Egger@amd.com>>
>>>
>>> On 04/15/11 10:33, ZhouPeng wrote:
>>> Signed-off-by: Zhou Peng<zhoupeng@nfs.iscas.ac.cn<mailto:
>>> zhoupeng@nfs.iscas.ac.cn>>
>>>
>>>
>>> tools/libxl: fix a bug in libxl__build_device_model_args_new.
>>> info->vncpasswd can't be empty if info->vncpasswd != NULL
>>>
>>>
>>> NACK!  This can info->vncpasswd[0] contains '\0' if you have
>>>
>>>
>>>   vncpasswd=''
>>>
>>> in the guest config file.
>>>
>>>  " if (info->vncpasswd&&   info->vncpasswd[0]) “ can
>>>   vncpasswd='' in guest cfg file, when using upstream-qemu-xen
>>>   and block vncpasswd='passwd'
>>>   Can it be reasonable?
>>>
>>>
>>
>> Does that mean upstream qemu-xen and in-tree qemu-xen behave differently?
>>
>   if (new_qemu == 1) {
>         return libxl__build_device_model_args_new(gc, info, disks,
> num_disks, vifs, num_vifs);
>     } else {
>         return libxl__build_device_model_args_old(gc, info, disks,
> num_disks, vifs, num_vifs);
>     }
>
>
>>  Christoph
>>
>>
>>
>> --
>> ---to satisfy European Law for business letters:
>> Advanced Micro Devices GmbH
>> Einsteinring 24, 85689 Dornach b. Muenchen
>> Geschaeftsfuehrer: Alberto Bozzo, Andrew Bowd
>> Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
>> Registergericht Muenchen, HRB Nr. 43632
>>
>>
>
>
> --
> Zhou Peng
> Operating System Technology Group
> Institute of Software, the Chinese Academy of Sciences (ISCAS)
> <ailvpeng25@gmail.com>
>



-- 
Zhou Peng
Operating System Technology Group
Institute of Software, the Chinese Academy of Sciences (ISCAS)
<ailvpeng25@gmail.com>

[-- Attachment #1.2: Type: text/html, Size: 4313 bytes --]

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

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