OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vnc: using bool type instead of int for QEMU_OPT_BOOL

Browse Source 
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gonglei 2015-01-30 10:14:36 +08:00 committed by Gerd Hoffmann
parent e2a11d9d5a
commit a2c72de096
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/vnc.c
View File

@ -3318,8 +3318,8 @@ void vnc_display_open(const char *id, Error **errp)
QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id); QemuOpts *opts = qemu_opts_find(&qemu_vnc_opts, id);
const char *share, *device_id; const char *share, *device_id;
QemuConsole *con; QemuConsole *con;
int password = 0; bool password = false;
int reverse = 0; bool reverse = false;
const char *vnc; const char *vnc;
const char *has_to; const char *has_to;
char *display, *to = NULL; char *display, *to = NULL;
@ -3329,11 +3329,11 @@ void vnc_display_open(const char *id, Error **errp)
const char *websocket; const char *websocket;
#endif #endif
#ifdef CONFIG_VNC_TLS #ifdef CONFIG_VNC_TLS
int tls = 0, x509 = 0; bool tls = false, x509 = false;
const char *path; const char *path;
#endif #endif
#ifdef CONFIG_VNC_SASL #ifdef CONFIG_VNC_SASL
int sasl = 0; bool sasl = false;
int saslErr; int saslErr;
#endif #endif
#if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL) #if defined(CONFIG_VNC_TLS) || defined(CONFIG_VNC_SASL)
@ -3385,7 +3385,7 @@ void vnc_display_open(const char *id, Error **errp)
tls = qemu_opt_get_bool(opts, "tls", false); tls = qemu_opt_get_bool(opts, "tls", false);
path = qemu_opt_get(opts, "x509"); path = qemu_opt_get(opts, "x509");
if (path) { if (path) {
x509 = 1; x509 = true;
vs->tls.x509verify = qemu_opt_get_bool(opts, "x509verify", false); vs->tls.x509verify = qemu_opt_get_bool(opts, "x509verify", false);
if (vnc_tls_set_x509_creds_dir(vs, path) < 0) { if (vnc_tls_set_x509_creds_dir(vs, path) < 0) {
error_setg(errp, "Failed to find x509 certificates/keys in %s", error_setg(errp, "Failed to find x509 certificates/keys in %s",