vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Clean up a few things checkpatch.pl would flag later on 

Fix a few style violations so that checkpatch.pl won't complain when I
move this code.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230109190321.1056914-9-armbru@redhat.com>
master
Markus Armbruster 2023-01-09 20:03:12 +01:00
parent 10e3c47a5d
commit 61d7f2a956
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monitor/hmp-cmds.c
View File

@ -587,9 +587,10 @@ void hmp_info_vnc(Monitor *mon, const QDict *qdict)
hmp_info_vnc_servers(mon, info->server); hmp_info_vnc_servers(mon, info->server);
hmp_info_vnc_clients(mon, info->clients); hmp_info_vnc_clients(mon, info->clients);
if (!info->server) { if (!info->server) {
/* The server entry displays its auth, we only /*
* need to display in the case of 'reverse' connections * The server entry displays its auth, we only need to
* where there's no server. * display in the case of 'reverse' connections where
* there's no server.
*/ */
hmp_info_vnc_authcrypt(mon, " ", info->auth, hmp_info_vnc_authcrypt(mon, " ", info->auth,
info->has_vencrypt ? &info->vencrypt : NULL); info->has_vencrypt ? &info->vencrypt : NULL);

21
monitor/qmp-cmds.c
View File

@ -186,8 +186,10 @@ void qmp_set_password(SetPasswordOptions *opts, Error **errp)
error_setg(errp, QERR_INVALID_PARAMETER, "connected"); error_setg(errp, QERR_INVALID_PARAMETER, "connected");
return; return;
} }
/* Note that setting an empty password will not disable login through /*
* this interface. */ * Note that setting an empty password will not disable login
* through this interface.
*/
rc = vnc_display_password(opts->u.vnc.display, opts->password); rc = vnc_display_password(opts->u.vnc.display, opts->password);
} }
@ -272,12 +274,10 @@ void qmp_add_client(const char *protocol, const char *fdname,
error_setg(errp, "spice failed to add client"); error_setg(errp, "spice failed to add client");
close(fd); close(fd);
} }
return;
#ifdef CONFIG_VNC #ifdef CONFIG_VNC
} else if (strcmp(protocol, "vnc") == 0) { } else if (strcmp(protocol, "vnc") == 0) {
skipauth = has_skipauth ? skipauth : false; skipauth = has_skipauth ? skipauth : false;
vnc_display_add_client(NULL, fd, skipauth); vnc_display_add_client(NULL, fd, skipauth);
return;
#endif #endif
#ifdef CONFIG_DBUS_DISPLAY #ifdef CONFIG_DBUS_DISPLAY
} else if (strcmp(protocol, "@dbus-display") == 0) { } else if (strcmp(protocol, "@dbus-display") == 0) {
@ -289,19 +289,20 @@ void qmp_add_client(const char *protocol, const char *fdname,
close(fd); close(fd);
return; return;
} }
return;
#endif #endif
} else if ((s = qemu_chr_find(protocol)) != NULL) { } else {
s = qemu_chr_find(protocol);
if (!s) {
error_setg(errp, "protocol '%s' is invalid", protocol);
close(fd);
return;
}
if (qemu_chr_add_client(s, fd) < 0) { if (qemu_chr_add_client(s, fd) < 0) {
error_setg(errp, "failed to add client"); error_setg(errp, "failed to add client");
close(fd); close(fd);
return; return;
} }
return;
} }
error_setg(errp, "protocol '%s' is invalid", protocol);
close(fd);
} }