Attachment 159810 Details for Bug 249072 – Fix to make VMs without VNC enabled startup correctly

[patch] Fix to make VMs without VNC enabled startup correctly

libvirt-vnc-listen-2.patch (text/plain), 17.71 KB, created by Daniel Berrangé on 2007-07-23 19:59:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Berrangé

Created: 2007-07-23 19:59:08 UTC

Size: 17.71 KB

patch

obsolete

>Index: src/qemu_conf.c
>===================================================================
>RCS file: /data/cvs/libvirt/src/qemu_conf.c,v
>retrieving revision 1.5
>diff -u -p -r1.5 qemu_conf.c
>--- src/qemu_conf.c	18 Jul 2007 21:47:47 -0000	1.5
>+++ src/qemu_conf.c	23 Jul 2007 19:48:07 -0000
>@@ -1197,14 +1197,23 @@ static struct qemud_vm_def *qemudParseXM
>         def->graphicsType = QEMUD_GRAPHICS_NONE;
>     } else if ((prop = xmlGetProp(obj->nodesetval->nodeTab[0], BAD_CAST "type"))) {
>         if (!strcmp((char *)prop, "vnc")) {
>+            xmlChar *vncport, *vnclisten;
>             def->graphicsType = QEMUD_GRAPHICS_VNC;
>-            prop = xmlGetProp(obj->nodesetval->nodeTab[0], BAD_CAST "port");
>-            if (prop) {
>+            vncport = xmlGetProp(obj->nodesetval->nodeTab[0], BAD_CAST "port");
>+            if (vncport) {
>                 conv = NULL;
>-                def->vncPort = strtoll((const char*)prop, &conv, 10);
>+                def->vncPort = strtoll((const char*)vncport, &conv, 10);
>             } else {
>                 def->vncPort = -1;
>             }
>+            vnclisten = xmlGetProp(obj->nodesetval->nodeTab[0], BAD_CAST "listen");
>+            if (vnclisten && *vnclisten)
>+                strncpy(def->vncListen, (char *)vnclisten, BR_INET_ADDR_MAXLEN-1);
>+            else
>+                strcpy(def->vncListen, "127.0.0.1");
>+            def->vncListen[BR_INET_ADDR_MAXLEN-1] = '\0';
>+            xmlFree(vncport);
>+            xmlFree(vnclisten);
>         } else if (!strcmp((char *)prop, "sdl")) {
>             def->graphicsType = QEMUD_GRAPHICS_SDL;
>         } else {
>@@ -1511,6 +1520,18 @@ int qemudBuildCommandLine(virConnectPtr 
>     if (!((*argv)[++n] = strdup(vcpus)))
>         goto no_memory;
> 
>+    /*
>+     * NB, -nographic *MUST* come before any serial, or monitor
>+     * or parallel port flags due to QEMU craziness, where it
>+     * decides to change the serial port & monitor to be on stdout
>+     * if you ask for nographic. So we have to make sure we override
>+     * these stupid defaults ourselves
>+     */
>+    if (vm->def->graphicsType == QEMUD_GRAPHICS_NONE) {
>+        if (!((*argv)[++n] = strdup("-nographic")))
>+            goto no_memory;
>+    }
>+
>     if (!((*argv)[++n] = strdup("-monitor")))
>         goto no_memory;
>     if (!((*argv)[++n] = strdup("pty")))
>@@ -1700,22 +1721,24 @@ int qemudBuildCommandLine(virConnectPtr 
>     }
> 
>     if (vm->def->graphicsType == QEMUD_GRAPHICS_VNC) {
>-        char port[10];
>+        char vncdisplay[BR_INET_ADDR_MAXLEN+20];
>         int ret;
>-        ret = snprintf(port, sizeof(port),
>-                       ((driver->qemuCmdFlags & QEMUD_CMD_FLAG_VNC_COLON) ?
>-                        ":%d" : "%d"),
>-                       vm->def->vncActivePort - 5900);
>-        if (ret < 0 || ret >= (int)sizeof(port))
>+        if (driver->qemuCmdFlags & QEMUD_CMD_FLAG_VNC_COLON)
>+            ret = snprintf(vncdisplay, sizeof(vncdisplay), "%s:%d",
>+                           vm->def->vncListen,
>+                           vm->def->vncActivePort - 5900);
>+        else
>+            ret = snprintf(vncdisplay, sizeof(vncdisplay), "%d",
>+                           vm->def->vncActivePort - 5900);
>+        if (ret < 0 || ret >= (int)sizeof(vncdisplay))
>             goto error;
> 
>         if (!((*argv)[++n] = strdup("-vnc")))
>             goto no_memory;
>-        if (!((*argv)[++n] = strdup(port)))
>+        if (!((*argv)[++n] = strdup(vncdisplay)))
>             goto no_memory;
>     } else if (vm->def->graphicsType == QEMUD_GRAPHICS_NONE) {
>-        if (!((*argv)[++n] = strdup("-nographic")))
>-            goto no_memory;
>+        /* Nada - we added -nographic earlier in this function */
>     } else {
>         /* SDL is the default. no args needed */
>     }
>@@ -2931,6 +2954,11 @@ char *qemudGenerateXML(virConnectPtr con
>                               qemudIsActiveVM(vm) && live ? def->vncActivePort : def->vncPort) < 0)
>             goto no_memory;
> 
>+        if (def->vncListen[0] &&
>+            virBufferVSprintf(buf, " listen='%s'",
>+                              def->vncListen) < 0)
>+            goto no_memory;
>+
>         if (virBufferAdd(buf, "/>\n", -1) < 0)
>             goto no_memory;
>         break;
>Index: src/qemu_conf.h
>===================================================================
>RCS file: /data/cvs/libvirt/src/qemu_conf.h,v
>retrieving revision 1.4
>diff -u -p -r1.4 qemu_conf.h
>--- src/qemu_conf.h	18 Jul 2007 21:08:22 -0000	1.4
>+++ src/qemu_conf.h	23 Jul 2007 19:48:07 -0000
>@@ -186,6 +186,7 @@ struct qemud_vm_def {
>     int graphicsType;
>     int vncPort;
>     int vncActivePort;
>+    char vncListen[BR_INET_ADDR_MAXLEN];
> 
>     int ndisks;
>     struct qemud_vm_disk_def *disks;
>Index: tests/qemuxml2argvtest.c
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvtest.c,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argvtest.c
>--- tests/qemuxml2argvtest.c	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvtest.c	23 Jul 2007 19:48:07 -0000
>@@ -146,11 +146,11 @@ main(int argc, char **argv)
>                     1, testCompareXMLToArgvHelper, "disk-many") < 0)
>         ret = -1;
> 
>-    if (0 && virtTestRun("QEMU XML-2-ARGV Graphics VNC",
>+    if (virtTestRun("QEMU XML-2-ARGV Graphics VNC",
>                     1, testCompareXMLToArgvHelper, "graphics-vnc") < 0)
>         ret = -1;
> 
>-    if (0 && virtTestRun("QEMU XML-2-ARGV Graphics SDL",
>+    if (virtTestRun("QEMU XML-2-ARGV Graphics SDL",
>                     1, testCompareXMLToArgvHelper, "graphics-sdl") < 0)
>         ret = -1;
> 
>Index: tests/qemuxml2xmltest.c
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2xmltest.c,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2xmltest.c
>--- tests/qemuxml2xmltest.c	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2xmltest.c	23 Jul 2007 19:48:07 -0000
>@@ -111,7 +111,7 @@ main(int argc, char **argv)
>                     1, testCompareXMLToXMLHelper, "disk-many") < 0)
>         ret = -1;
> 
>-    if (0 && virtTestRun("QEMU XML-2-ARGV Graphics VNC",
>+    if (virtTestRun("QEMU XML-2-ARGV Graphics VNC",
>                     1, testCompareXMLToXMLHelper, "graphics-vnc") < 0)
>         ret = -1;
> 
>Index: tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-boot-cdrom.args
>--- tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot d -cdrom /dev/cdrom -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot d -cdrom /dev/cdrom -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-boot-floppy.args
>--- tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot a -hda /dev/HostVG/QEMUGuest1 -fda /tmp/firmware.img -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot a -hda /dev/HostVG/QEMUGuest1 -fda /tmp/firmware.img -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-boot-network.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-boot-network.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-boot-network.args
>--- tests/qemuxml2argvdata/qemuxml2argv-boot-network.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-boot-network.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot n -hda /dev/HostVG/QEMUGuest1 -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot n -hda /dev/HostVG/QEMUGuest1 -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-clock-localtime.args
>--- tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -localtime -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -localtime -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-clock-utc.args
>--- tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-disk-cdrom.args
>--- tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -cdrom /root/boot.iso -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-disk-floppy.args
>--- tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 -fdb /tmp/firmware.img -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -fda /dev/fd0 -fdb /tmp/firmware.img -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-disk-many.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-disk-many.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-disk-many.args
>--- tests/qemuxml2argvdata/qemuxml2argv-disk-many.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-disk-many.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -hdb /dev/HostVG/QEMUGuest2 -hdc /tmp/data.img -hdd /tmp/logs.img -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -hdb /dev/HostVG/QEMUGuest2 -hdc /tmp/data.img -hdd /tmp/logs.img -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-graphics-sdl.args
>--- tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -sdl
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-input-usbmouse.args
>--- tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -usbdevice mouse -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -usbdevice mouse
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-input-usbtablet.args
>--- tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -usbdevice tablet -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -usbdevice tablet
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-minimal.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-minimal.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-minimal.args
>--- tests/qemuxml2argvdata/qemuxml2argv-minimal.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-minimal.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-misc-acpi.args
>--- tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-misc-no-reboot.args
>--- tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-reboot -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-reboot -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net none -usb
>\ No newline at end of file
>Index: tests/qemuxml2argvdata/qemuxml2argv-net-user.args
>===================================================================
>RCS file: /data/cvs/libvirt/tests/qemuxml2argvdata/qemuxml2argv-net-user.args,v
>retrieving revision 1.1
>diff -u -p -r1.1 qemuxml2argv-net-user.args
>--- tests/qemuxml2argvdata/qemuxml2argv-net-user.args	18 Jul 2007 21:34:22 -0000	1.1
>+++ tests/qemuxml2argvdata/qemuxml2argv-net-user.args	23 Jul 2007 19:48:07 -0000
>@@ -1 +1 @@
>-/usr/bin/qemu -M pc -m 214 -smp 1 -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,macaddr=00:11:22:33:44:55,vlan=0 -net user,vlan=0 -usb -nographic
>\ No newline at end of file
>+/usr/bin/qemu -M pc -m 214 -smp 1 -nographic -monitor pty -no-acpi -boot c -hda /dev/HostVG/QEMUGuest1 -net nic,macaddr=00:11:22:33:44:55,vlan=0 -net user,vlan=0 -usb
>\ No newline at end of file

Actions: View | Diff

Attachments on bug 249072: 159809 | 159810