ui/vnc: vnc_display_init() and vnc_display_open() return bool
Use the QEMU-style error pattern returning "true" on success. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Marc-André Lureau committed
Apr 4, 2026 at 18:28 UTC
86dd35cf71bf66b6cc2fc3e1399ee0528b087150
2 files changed
+12
-12
include/ui/console.h
+2
-2
@@ -438,8 +438,8 @@ const char *qemu_display_get_vc(DisplayOptions *opts);
438
void qemu_display_help(void);
439
440
/* vnc.c */
441
-void vnc_display_init(const char *id, Error **errp);
442
-void vnc_display_open(const char *id, Error **errp);
441
+bool vnc_display_init(const char *id, Error **errp);
442
+bool vnc_display_open(const char *id, Error **errp);
443
void vnc_display_add_client(const char *id, int csock, bool skipauth);
444
int vnc_display_password(const char *id, const char *password, Error **errp);
445
int vnc_display_pw_expire(const char *id, time_t expires);
ui/vnc.c
+10
-10
@@ -3425,12 +3425,12 @@ static void vmstate_change_handler(void *opaque, bool running, RunState state)
3425
3426
static void vnc_display_free(VncDisplay *vd);
3427
3428
-void vnc_display_init(const char *id, Error **errp)
3428
+bool vnc_display_init(const char *id, Error **errp)
3429
{
3430
VncDisplay *vd;
3431
3432
if (vnc_display_find(id) != NULL) {
3433
- return;
3433
+ return true;
3434
}
3435
vd = g_malloc0(sizeof(*vd));
3436
@@ -3451,7 +3451,7 @@ void vnc_display_init(const char *id, Error **errp)
3451
3452
if (!vd->kbd_layout) {
3453
vnc_display_free(vd);
3454
- return;
3454
+ return false;
3455
}
3456
3457
vd->share_policy = VNC_SHARE_POLICY_ALLOW_EXCLUSIVE;
@@ -3465,6 +3465,7 @@ void vnc_display_init(const char *id, Error **errp)
3465
&vmstate_change_handler, vd);
3466
3467
QTAILQ_INSERT_TAIL(&vnc_displays, vd, next);
3468
+ return true;
3469
}
3470
3471
static void vnc_display_close(VncDisplay *vd)
@@ -4070,7 +4071,7 @@ bool vnc_display_update(DisplayUpdateOptionsVNC *arg, Error **errp)
4071
return true;
4072
}
4073
4073
-void vnc_display_open(const char *id, Error **errp)
4074
+bool vnc_display_open(const char *id, Error **errp)
4075
{
4076
VncDisplay *vd = vnc_display_find(id);
4077
QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id);
@@ -4273,7 +4274,7 @@ void vnc_display_open(const char *id, Error **errp)
4274
qkbd_state_set_delay(vd->kbd, key_delay_ms);
4275
4276
if (saddr_list == NULL) {
4276
- return;
4277
+ return true;
4278
}
4279
4280
if (reverse) {
@@ -4291,10 +4292,11 @@ void vnc_display_open(const char *id, Error **errp)
4292
}
4293
4294
/* Success */
4294
- return;
4295
+ return true;
4296
4297
fail:
4298
vnc_display_close(vd);
4299
+ return false;
4300
}
4301
4302
void vnc_display_add_client(const char *id, int csock, bool skipauth)
@@ -4350,12 +4352,10 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
4352
id = vnc_auto_assign_id(opts);
4353
}
4354
4353
- vnc_display_init(id, errp);
4354
- if (*errp) {
4355
+ if (!vnc_display_init(id, errp)) {
4356
return -1;
4357
}
4357
- vnc_display_open(id, errp);
4358
- if (*errp) {
4358
+ if (!vnc_display_open(id, errp)) {
4359
return -1;
4360
}
4361
return 0;