From mboxrd@z Thu Jan 1 00:00:00 1970 From: ZhouPeng Subject: Fwd:[PATCH-may be a bug ignored] tools/libxl/libxl__build_device_model_args_new/old: The condition is so rigorous that user has no chance to disable the vnc Date: Wed, 20 Apr 2011 14:59:28 +0800 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary=bcaec51dd18571bb3104a1542ae2 Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "Xen-Devel (E-mail)" , Stefano Stabellini , "ian.jackson" List-Id: xen-devel@lists.xenproject.org --bcaec51dd18571bb3104a1542ae2 Content-Type: text/plain; charset=ISO-8859-1 In my spice testing, I find user have no way to disable vnc in qemu-old and new using xl, no matter how to set "vnc vncunused vncpasswd vncdisplay vnclisten" in vm cfg file. I think this may be a bug ignored. Signed-off-by: Zhou Peng tools/libxl/libxl__build_device_model_args_new/old: The condition is so rigorous that user has no chance to disable the vnc, considering what has been done in parse_config_data() by default, which is not resonable with vnc option in vm-cfg file. I think, If user explicitly set "vnc=0", vnc should be disabled. User should have the chance to only use sdl, other remote display(spice) and even nothing. diff -r 41879bb8d174 -r 6871474a2a09 tools/libxl/libxl_dm.c --- a/tools/libxl/libxl_dm.c Fri Apr 15 09:51:14 2011 +0800 +++ b/tools/libxl/libxl_dm.c Fri Apr 15 10:06:59 2011 +0800 @@ -55,7 +55,7 @@ static char ** libxl__build_device_model if (info->dom_name) flexarray_vappend(dm_args, "-domain-name", info->dom_name, NULL); - if (info->vnc || info->vncdisplay || info->vnclisten || info->vncunused) { + if (info->vnc) { char *vncarg; if (info->vncdisplay) { if (info->vnclisten && strchr(info->vnclisten, ':') == NULL) { @@ -205,7 +205,7 @@ static char ** libxl__build_device_model if (info->dom_name) { flexarray_vappend(dm_args, "-name", info->dom_name, NULL); } - if (info->vnc || info->vncdisplay || info->vnclisten || info->vncunused) { + if (info->vnc) { int display = 0; const char *listen = "127.0.0.1"; -- Zhou Peng Operating System Technology Group Institute of Software, the Chinese Academy of Sciences (ISCAS) --bcaec51dd18571bb3104a1542ae2 Content-Type: text/x-patch; charset=US-ASCII; name="tools-libxl-user-chance-to-disable-vnc.diff" Content-Disposition: attachment; filename="tools-libxl-user-chance-to-disable-vnc.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gmpwm9fl0 SW4gbXkgc3BpY2UgdGVzdGluZywgCkkgZmluZCB1c2VyIGhhdmUgbm8gd2F5IHRvIGRpc2FibGUg dm5jIGluIHFlbXUtb2xkIGFuZCBuZXcgdXNpbmcgeGwgdGhyb3VnaCB4bSBjZmcgZmlsZS4KSSB0 aGluayB0aGlzIG1heSBiZSBhIGJ1ZyBpZ25vcmVkLgoKU2lnbmVkLW9mZi1ieTogWmhvdSBQZW5n IDx6aG91cGVuZ0BuZnMuaXNjYXMuYWMuY24+Cgp0b29scy9saWJ4bC9saWJ4bF9fYnVpbGRfZGV2 aWNlX21vZGVsX2FyZ3NfbmV3L29sZDogVGhlIGNvbmRpdGlvbiBpcyBzbyByaWdvcm91cyB0aGF0 IHVzZXIgaGFzIG5vIGNoYW5jZSB0byBkaXNhYmxlIHRoZSB2bmMsCmNvbnNpZGVyaW5nIHdoYXQg aGFzIGJlZW4gZG9uZSBpbiBwYXJzZV9jb25maWdfZGF0YSgpIGJ5IGRlZmF1bHQsIHdoaWNoIGlz IG5vdCByZXNvbmFibGUgd2l0aCB2bmMgb3B0aW9uIGluIHZtLWNmZyBmaWxlLgoKSSB0aGluaywg SWYgdXNlciBleHBsaWNpdGx5IHNldCAidm5jPTAiLCB2bmMgc2hvdWxkIGJlIGRpc2FibGVkLgpV c2VyIHNob3VsZCBoYXZlIHRoZSBjaGFuY2UgdG8gb25seSB1c2Ugc2RsLCBvdGhlciByZW1vdGUg ZGlzcGxheShzcGljZSkgYW5kIGV2ZW4gbm90aGluZy4KCmRpZmYgLXIgNDE4NzliYjhkMTc0IC1y IDY4NzE0NzRhMmEwOSB0b29scy9saWJ4bC9saWJ4bF9kbS5jCi0tLSBhL3Rvb2xzL2xpYnhsL2xp YnhsX2RtLmMJRnJpIEFwciAxNSAwOTo1MToxNCAyMDExICswODAwCisrKyBiL3Rvb2xzL2xpYnhs L2xpYnhsX2RtLmMJRnJpIEFwciAxNSAxMDowNjo1OSAyMDExICswODAwCkBAIC01NSw3ICs1NSw3 IEBAIHN0YXRpYyBjaGFyICoqIGxpYnhsX19idWlsZF9kZXZpY2VfbW9kZWwKICAgICBpZiAoaW5m by0+ZG9tX25hbWUpCiAgICAgICAgIGZsZXhhcnJheV92YXBwZW5kKGRtX2FyZ3MsICItZG9tYWlu LW5hbWUiLCBpbmZvLT5kb21fbmFtZSwgTlVMTCk7CiAKLSAgICBpZiAoaW5mby0+dm5jIHx8IGlu Zm8tPnZuY2Rpc3BsYXkgfHwgaW5mby0+dm5jbGlzdGVuIHx8IGluZm8tPnZuY3VudXNlZCkgewor ICAgIGlmIChpbmZvLT52bmMpIHsKICAgICAgICAgY2hhciAqdm5jYXJnOwogICAgICAgICBpZiAo aW5mby0+dm5jZGlzcGxheSkgewogICAgICAgICAgICAgaWYgKGluZm8tPnZuY2xpc3RlbiAmJiBz dHJjaHIoaW5mby0+dm5jbGlzdGVuLCAnOicpID09IE5VTEwpIHsKQEAgLTIwNSw3ICsyMDUsNyBA QCBzdGF0aWMgY2hhciAqKiBsaWJ4bF9fYnVpbGRfZGV2aWNlX21vZGVsCiAgICAgaWYgKGluZm8t PmRvbV9uYW1lKSB7CiAgICAgICAgIGZsZXhhcnJheV92YXBwZW5kKGRtX2FyZ3MsICItbmFtZSIs IGluZm8tPmRvbV9uYW1lLCBOVUxMKTsKICAgICB9Ci0gICAgaWYgKGluZm8tPnZuYyB8fCBpbmZv LT52bmNkaXNwbGF5IHx8IGluZm8tPnZuY2xpc3RlbiB8fCBpbmZvLT52bmN1bnVzZWQpIHsKKyAg ICBpZiAoaW5mby0+dm5jKSB7CiAgICAgICAgIGludCBkaXNwbGF5ID0gMDsKICAgICAgICAgY29u c3QgY2hhciAqbGlzdGVuID0gIjEyNy4wLjAuMSI7CiAK --bcaec51dd18571bb3104a1542ae2 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 --bcaec51dd18571bb3104a1542ae2--