monitor: Don't change VNC server when disabled
PATCH 1/1 monitor: Don't change VNC server when disabled
[ 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 Jan Kiszka <[email protected]>
---
vnc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
vnc.c +4 -0
@@ -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 ;
Anthony Liguori
AppliedQuoted 7 lines · 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 Jan Kiszka <[email protected]>
Applied. Thanks.
Regards,
Anthony Liguori
Quoted 30 lines
---
vnc.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)vnc.c +4
-0@@ -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 ;