vnc: set id at parse time not init time
This way the generated id will be stored in -writeconfig cfg files. Also we can make vnc_auto_assign_id() local to vnc.c. Tested-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
277263e1b3
commit
9634f4e3b7
|
@ -335,7 +335,6 @@ void vnc_display_init(const char *id);
|
||||||
void vnc_display_open(const char *id, Error **errp);
|
void vnc_display_open(const char *id, Error **errp);
|
||||||
void vnc_display_add_client(const char *id, int csock, bool skipauth);
|
void vnc_display_add_client(const char *id, int csock, bool skipauth);
|
||||||
char *vnc_display_local_addr(const char *id);
|
char *vnc_display_local_addr(const char *id);
|
||||||
void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts);
|
|
||||||
#ifdef CONFIG_VNC
|
#ifdef CONFIG_VNC
|
||||||
int vnc_display_password(const char *id, const char *password);
|
int vnc_display_password(const char *id, const char *password);
|
||||||
int vnc_display_pw_expire(const char *id, time_t expires);
|
int vnc_display_pw_expire(const char *id, time_t expires);
|
||||||
|
|
1
qmp.c
1
qmp.c
|
@ -391,7 +391,6 @@ static void qmp_change_vnc_listen(const char *target, Error **errp)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
vnc_auto_assign_id(olist, opts);
|
|
||||||
vnc_display_open("default", errp);
|
vnc_display_open("default", errp);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
22
ui/vnc.c
22
ui/vnc.c
|
@ -3687,12 +3687,7 @@ void vnc_display_add_client(const char *id, int csock, bool skipauth)
|
||||||
vnc_connect(vs, csock, skipauth, false);
|
vnc_connect(vs, csock, skipauth, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
QemuOpts *vnc_parse_func(const char *str)
|
static void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts)
|
||||||
{
|
|
||||||
return qemu_opts_parse(qemu_find_opts("vnc"), str, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts)
|
|
||||||
{
|
{
|
||||||
int i = 2;
|
int i = 2;
|
||||||
char *id;
|
char *id;
|
||||||
|
@ -3705,18 +3700,25 @@ void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts)
|
||||||
qemu_opts_set_id(opts, id);
|
qemu_opts_set_id(opts, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
int vnc_init_func(QemuOpts *opts, void *opaque)
|
QemuOpts *vnc_parse_func(const char *str)
|
||||||
{
|
{
|
||||||
Error *local_err = NULL;
|
|
||||||
QemuOptsList *olist = qemu_find_opts("vnc");
|
QemuOptsList *olist = qemu_find_opts("vnc");
|
||||||
char *id = (char *)qemu_opts_id(opts);
|
QemuOpts *opts = qemu_opts_parse(olist, str, 1);
|
||||||
|
const char *id = qemu_opts_id(opts);
|
||||||
|
|
||||||
if (!id) {
|
if (!id) {
|
||||||
/* auto-assign id if not present */
|
/* auto-assign id if not present */
|
||||||
vnc_auto_assign_id(olist, opts);
|
vnc_auto_assign_id(olist, opts);
|
||||||
id = (char *)qemu_opts_id(opts);
|
|
||||||
}
|
}
|
||||||
|
return opts;
|
||||||
|
}
|
||||||
|
|
||||||
|
int vnc_init_func(QemuOpts *opts, void *opaque)
|
||||||
|
{
|
||||||
|
Error *local_err = NULL;
|
||||||
|
char *id = (char *)qemu_opts_id(opts);
|
||||||
|
|
||||||
|
assert(id);
|
||||||
vnc_display_init(id);
|
vnc_display_init(id);
|
||||||
vnc_display_open(id, &local_err);
|
vnc_display_open(id, &local_err);
|
||||||
if (local_err != NULL) {
|
if (local_err != NULL) {
|
||||||
|
|
Loading…
Reference in New Issue