From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50569) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNe3A-00037s-AT for qemu-devel@nongnu.org; Tue, 17 Feb 2015 04:02:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YNe37-0001AS-0y for qemu-devel@nongnu.org; Tue, 17 Feb 2015 04:02:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49023) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YNe36-0001AC-P6 for qemu-devel@nongnu.org; Tue, 17 Feb 2015 04:02:32 -0500 From: Gerd Hoffmann Date: Tue, 17 Feb 2015 10:02:26 +0100 Message-Id: <1424163747-27927-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1424163747-27927-1-git-send-email-kraxel@redhat.com> References: <1424163747-27927-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] vnc: set id at parse time not init time List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Luiz Capitulino , armbru@redhat.com, Anthony Liguori , Gerd Hoffmann This way the generated id will be stored in -writeconfig cfg files. Also we can make vnc_auto_assign_id() local to vnc.c. Signed-off-by: Gerd Hoffmann --- include/ui/console.h | 1 - qmp.c | 1 - ui/vnc.c | 22 ++++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 5c19c3c..8a4d671 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -335,7 +335,6 @@ void vnc_display_init(const char *id); void vnc_display_open(const char *id, Error **errp); void vnc_display_add_client(const char *id, int csock, bool skipauth); char *vnc_display_local_addr(const char *id); -void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts); #ifdef CONFIG_VNC int vnc_display_password(const char *id, const char *password); int vnc_display_pw_expire(const char *id, time_t expires); diff --git a/qmp.c b/qmp.c index d701cff..c479e77 100644 --- a/qmp.c +++ b/qmp.c @@ -391,7 +391,6 @@ static void qmp_change_vnc_listen(const char *target, Error **errp) return; } - vnc_auto_assign_id(olist, opts); vnc_display_open("default", errp); } diff --git a/ui/vnc.c b/ui/vnc.c index 10a2724..ff0b5bd 100644 --- a/ui/vnc.c +++ b/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); } -QemuOpts *vnc_parse_func(const char *str) -{ - return qemu_opts_parse(qemu_find_opts("vnc"), str, 1); -} - -void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts) +static void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts) { int i = 2; char *id; @@ -3705,18 +3700,25 @@ void vnc_auto_assign_id(QemuOptsList *olist, QemuOpts *opts) 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"); - char *id = (char *)qemu_opts_id(opts); + QemuOpts *opts = qemu_opts_parse(olist, str, 1); + const char *id = qemu_opts_id(opts); if (!id) { /* auto-assign id if not present */ 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_open(id, &local_err); if (local_err != NULL) { -- 1.8.3.1