Previously, the display change listener was registered early in vnc_display_new() without a console, requiring vnc_display_open() to conditionally unregister and re-register it when the actual console was resolved. Since vnc_display_new() and vnc_display_open() were merged in the previous commit, simply delay the registration and keyboard state initialization to vnc_display_open(), after the console has been looked up. This removes the conditional re-registration and simplifies the code.
Signed-off-by: Marc-André Lureau <[email protected]> --- ui/vnc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ui/vnc.c b/ui/vnc.c index 2c53c92914b..c38be7113f1 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3458,8 +3458,6 @@ VncDisplay *vnc_display_new(const char *id, Error **errp) vnc_start_worker_thread(); - register_displaychangelistener(&vd->dcl); - vd->kbd = qkbd_state_init(vd->dcl.con); vd->vmstate_handler_entry = qemu_add_vm_change_state_handler( &vmstate_change_handler, vd); @@ -4263,13 +4261,9 @@ static bool vnc_display_open(VncDisplay *vd, Error **errp) con = qemu_console_lookup_default(); } - if (con != vd->dcl.con) { - qkbd_state_free(vd->kbd); - unregister_displaychangelistener(&vd->dcl); - vd->dcl.con = con; - register_displaychangelistener(&vd->dcl); - vd->kbd = qkbd_state_init(vd->dcl.con); - } + vd->dcl.con = con; + register_displaychangelistener(&vd->dcl); + vd->kbd = qkbd_state_init(vd->dcl.con); qkbd_state_set_delay(vd->kbd, key_delay_ms); if (saddr_list == NULL) { -- 2.53.0
