Attachment 302184 Details for Bug 442140 – Proposed patch

[patch] Proposed patch

vncunused.patch (text/plain), 1.35 KB, created by Bryan Mason on 2008-04-12 00:38:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryan Mason

Created: 2008-04-12 00:38:50 UTC

Size: 1.35 KB

patch

obsolete

>diff -upr /usr/src/redhat/BUILD/libvirt-0.3.3/src/xm_internal.c ./src/xm_internal.c
>--- /usr/src/redhat/BUILD/libvirt-0.3.3/src/xm_internal.c	2008-04-03 13:39:20.000000000 +0900
>+++ ./src/xm_internal.c	2008-04-03 13:36:41.000000000 +0900
>@@ -2122,9 +2122,8 @@ virConfPtr xenXMParseXMLToConfig(virConn
>                     xmlChar *vncpasswd = xmlGetProp(obj->nodesetval->nodeTab[i], BAD_CAST "passwd");
>                     xmlChar *keymap = xmlGetProp(obj->nodesetval->nodeTab[i], BAD_CAST "keymap");
>                     int vncunused = vncport ? (!strcmp((const char*)vncport, "-1") ? 1 : 0) : 1;
>-                    if (vncunused)
>-                        len += 12;
>-                    else
>+                    len += 12;
>+                    if (!vncunused) 
>                         len += 12 + strlen((const char*)vncport);/* vncdisplay= */
>                     if (vnclisten)
>                         len += 11 + strlen((const char*)vnclisten);
>@@ -2142,6 +2141,7 @@ virConfPtr xenXMParseXMLToConfig(virConn
>                             snprintf(portstr, sizeof(portstr), "%d", port-5900);
>                             strcat(val, ",vncdisplay=");
>                             strcat(val, portstr);
>+                            strcat(val, ",vncunused=0");
>                         }
>                         if (vncport)
>                             xmlFree(vncport);

Actions: View | Diff

Attachments on bug 442140: 302184