ui/vnc: simplify vnc_init_func error handling
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>
Marc-André Lureau committed
Feb 24, 2026 at 15:43 UTC
f3cec33f0881df23771697329d5123a5f201c933
1 file changed
+5
-7
ui/vnc.c
+5
-7
@@ -4321,7 +4321,7 @@ void vnc_parse(const char *str)
4321
4322
int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
4323
{
4324
- Error *local_err = NULL;
4324
+ ERRP_GUARD();
4325
char *id = (char *)qemu_opts_id(opts);
4326
4327
if (!id) {
@@ -4329,14 +4329,12 @@ int vnc_init_func(void *opaque, QemuOpts *opts, Error **errp)
4329
id = vnc_auto_assign_id(opts);
4330
}
4331
4332
- vnc_display_init(id, &local_err);
4333
- if (local_err) {
4334
- error_propagate(errp, local_err);
4332
+ vnc_display_init(id, errp);
4333
+ if (*errp) {
4334
return -1;
4335
}
4337
- vnc_display_open(id, &local_err);
4338
- if (local_err != NULL) {
4339
- error_propagate(errp, local_err);
4336
+ vnc_display_open(id, errp);
4337
+ if (*errp) {
4338
return -1;
4339
}
4340
return 0;