Commit 452b4d88 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

monitor: Don't change VNC server when disabled (Jan Kiszka)



[ As requested, broken out of the monitor rework series. ]

Avoid a segfault when the user issues 'change vnc' without having vnc
enabled on startup.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6616 c046a42c-6fe2-441c-8c8c-71466251a162
parent 322691a5
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -2333,6 +2333,8 @@ void vnc_display_close(DisplayState *ds)
{
    VncState *vs = ds ? (VncState *)ds->opaque : vnc_state;

    if (!vs)
        return;
    if (vs->display) {
	qemu_free(vs->display);
	vs->display = NULL;
@@ -2392,6 +2394,8 @@ int vnc_display_open(DisplayState *ds, const char *display)
    int tls = 0, x509 = 0;
#endif

    if (!vnc_state)
        return -1;
    vnc_display_close(ds);
    if (strcmp(display, "none") == 0)
	return 0;