From mboxrd@z Thu Jan  1 00:00:00 1970
From: ZhouPeng <zpengxen@gmail.com>
Subject: [PATCH]tools/libxl: fix a bug in
 libxl__build_device_model_args_new.
 info->vncpasswd can't be empty if info->vncpasswd != NULL
Date: Fri, 15 Apr 2011 16:33:38 +0800
Message-ID: <BANLkTikOiFNm5OM+JFtpW6_32zTtpcUQYA@mail.gmail.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary=bcaec544ec8209568304a0f0e648
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 (E-mail)" <xen-devel@lists.xensource.com>, Ian.Jackson@eu.citrix.com, Ian Campbell <Ian.Campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

--bcaec544ec8209568304a0f0e648
Content-Type: multipart/alternative; boundary=bcaec544ec8209567604a0f0e646

--bcaec544ec8209567604a0f0e646
Content-Type: text/plain; charset=ISO-8859-1

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]) {
             assert(!"missing code for supplying vnc password to qemu");
         }
         flexarray_append(dm_args, "-vnc");

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

--bcaec544ec8209567604a0f0e646
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Zhou Peng &lt;<a href=3D"mailto:zhoupeng@nfs.iscas.ac.cn">zh=
oupeng@nfs.iscas.ac.cn</a>&gt;<br><br>tools/libxl: fix a bug in libxl__buil=
d_device_model_args_new. info-&gt;vncpasswd can&#39;t be empty if info-&gt;=
vncpasswd !=3D NULL<br>
<br>diff -r 3f00c5faa12a tools/libxl/libxl_dm.c<br>--- a/tools/libxl/libxl_=
dm.c=A0=A0=A0 Wed Apr 13 16:10:26 2011 +0100<br>+++ b/tools/libxl/libxl_dm.=
c=A0=A0=A0 Fri Apr 15 09:45:43 2011 +0800<br>@@ -209,7 +209,7 @@ static cha=
r ** libxl__build_device_model<br>
=A0=A0=A0=A0=A0=A0=A0=A0 int display =3D 0;<br>=A0=A0=A0=A0=A0=A0=A0=A0 con=
st char *listen =3D &quot;127.0.0.1&quot;;<br>=A0<br>-=A0=A0=A0=A0=A0=A0=A0=
 if (info-&gt;vncpasswd &amp;&amp; info-&gt;vncpasswd[0]) {<br>+=A0=A0=A0=
=A0=A0=A0=A0 if (info-&gt;vncpasswd &amp;&amp; !info-&gt;vncpasswd[0]) {<br=
>
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 assert(!&quot;missing code for supplyi=
ng vnc password to qemu&quot;);<br>=A0=A0=A0=A0=A0=A0=A0=A0 }<br>=A0=A0=A0=
=A0=A0=A0=A0=A0 flexarray_append(dm_args, &quot;-vnc&quot;);<br clear=3D"al=
l"><br>-- <br>Zhou Peng<br>Operating System Technology Group<br>
Institute of Software, the Chinese Academy of Sciences (ISCAS)<br><a href=
=3D"mailto:ailvpeng25@gmail.com" target=3D"_blank"></a><br>

--bcaec544ec8209567604a0f0e646--

--bcaec544ec8209568304a0f0e648
Content-Type: text/x-patch; charset=US-ASCII; name="vnc-password.diff"
Content-Disposition: attachment; filename="vnc-password.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gmiv1vfy0

U2lnbmVkLW9mZi1ieTogWmhvdSBQZW5nIDx6aG91cGVuZ0BuZnMuaXNjYXMuYWMuY24+Cgp0b29s
cy9saWJ4bDogZml4IGEgYnVnIGluIGxpYnhsX19idWlsZF9kZXZpY2VfbW9kZWxfYXJnc19uZXcu
IGluZm8tPnZuY3Bhc3N3ZCBjYW4ndCBiZSBlbXB0eSBpZiBpbmZvLT52bmNwYXNzd2QgIT0gTlVM
TAoKZGlmZiAtciAzZjAwYzVmYWExMmEgdG9vbHMvbGlieGwvbGlieGxfZG0uYwotLS0gYS90b29s
cy9saWJ4bC9saWJ4bF9kbS5jCVdlZCBBcHIgMTMgMTY6MTA6MjYgMjAxMSArMDEwMAorKysgYi90
b29scy9saWJ4bC9saWJ4bF9kbS5jCUZyaSBBcHIgMTUgMDk6NDU6NDMgMjAxMSArMDgwMApAQCAt
MjA5LDcgKzIwOSw3IEBAIHN0YXRpYyBjaGFyICoqIGxpYnhsX19idWlsZF9kZXZpY2VfbW9kZWwK
ICAgICAgICAgaW50IGRpc3BsYXkgPSAwOwogICAgICAgICBjb25zdCBjaGFyICpsaXN0ZW4gPSAi
MTI3LjAuMC4xIjsKIAotICAgICAgICBpZiAoaW5mby0+dm5jcGFzc3dkICYmIGluZm8tPnZuY3Bh
c3N3ZFswXSkgeworICAgICAgICBpZiAoaW5mby0+dm5jcGFzc3dkICYmICFpbmZvLT52bmNwYXNz
d2RbMF0pIHsKICAgICAgICAgICAgIGFzc2VydCghIm1pc3NpbmcgY29kZSBmb3Igc3VwcGx5aW5n
IHZuYyBwYXNzd29yZCB0byBxZW11Iik7CiAgICAgICAgIH0KICAgICAgICAgZmxleGFycmF5X2Fw
cGVuZChkbV9hcmdzLCAiLXZuYyIpOwo=
--bcaec544ec8209568304a0f0e648
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

--bcaec544ec8209568304a0f0e648--