Commit 2823b97cb1 for qemu.org
commit 2823b97cb1706d31f751fa4ae740bf2480710211
Author: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue Feb 24 16:40:42 2026 +0100
ui/vnc: assert preconditions instead of silently returning
Replace defensive NULL guards with assert() in vnc_display_close()
and vnc_display_open(). These are internal functions whose callers
guarantee non-NULL arguments, so a NULL value would indicate a
programming error rather than a runtime condition.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
diff --git a/ui/vnc.c b/ui/vnc.c
index 4aa446a48d..e6860cf4c8 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3467,9 +3467,7 @@ void vnc_display_init(const char *id, Error **errp)
static void vnc_display_close(VncDisplay *vd)
{
- if (!vd) {
- return;
- }
+ assert(vd);
if (vd->listener) {
qio_net_listener_disconnect(vd->listener);
@@ -4070,15 +4068,10 @@ void vnc_display_open(const char *id, Error **errp)
const char *audiodev;
const char *passwordSecret;
- if (!vd) {
- error_setg(errp, "VNC display not active");
- return;
- }
- vnc_display_close(vd);
+ assert(vd);
+ assert(opts);
- if (!opts) {
- return;
- }
+ vnc_display_close(vd);
reverse = qemu_opt_get_bool(opts, "reverse", false);
if (vnc_display_get_addresses(opts, reverse, &saddr_list, &wsaddr_list,