ui: remove deprecated 'password' option for SPICE
This has been replaced by the 'password-secret' option, which references a 'secret' object instance. Reviewed-by: Fabiano Rosas <farosas@suse.de> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
@@ -412,9 +412,6 @@ static QemuOptsList qemu_spice_opts = {
|
||||
.name = "unix",
|
||||
.type = QEMU_OPT_BOOL,
|
||||
#endif
|
||||
},{
|
||||
.name = "password",
|
||||
.type = QEMU_OPT_STRING,
|
||||
},{
|
||||
.name = "password-secret",
|
||||
.type = QEMU_OPT_STRING,
|
||||
@@ -666,20 +663,8 @@ static void qemu_spice_init(void)
|
||||
}
|
||||
passwordSecret = qemu_opt_get(opts, "password-secret");
|
||||
if (passwordSecret) {
|
||||
if (qemu_opt_get(opts, "password")) {
|
||||
error_report("'password' option is mutually exclusive with "
|
||||
"'password-secret'");
|
||||
exit(1);
|
||||
}
|
||||
password = qcrypto_secret_lookup_as_utf8(passwordSecret,
|
||||
&error_fatal);
|
||||
} else {
|
||||
str = qemu_opt_get(opts, "password");
|
||||
if (str) {
|
||||
warn_report("'password' option is deprecated and insecure, "
|
||||
"use 'password-secret' instead");
|
||||
password = g_strdup(str);
|
||||
}
|
||||
}
|
||||
|
||||
if (tls_port) {
|
||||
|
||||
Reference in New Issue
Block a user