From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKp1H-0004z4-D0 for qemu-devel@nongnu.org; Tue, 04 Mar 2014 08:04:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WKp1C-00036G-HC for qemu-devel@nongnu.org; Tue, 04 Mar 2014 08:04:27 -0500 Received: from mx1.redhat.com ([209.132.183.28]:22528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WKp1C-000365-9P for qemu-devel@nongnu.org; Tue, 04 Mar 2014 08:04:22 -0500 Date: Tue, 4 Mar 2014 15:03:17 +0200 From: "Michael S. Tsirkin" Message-ID: <1393937889-14553-7-git-send-email-mst@redhat.com> References: <1393937889-14553-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1393937889-14553-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 06/12] Rework --name to use QemuOpts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , =?us-ascii?B?PT9VVEYtOD9xP0FsZXg9MjBCZW5uPUMzPUE5ZT89?= , "Dr. David Alan Gilbert" , Anthony Liguori , Laszlo Ersek From: "Dr. David Alan Gilbert" Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Alex Benn=E9e Acked-by: Michael S. Tsirkin Reviewed-by: Laszlo Ersek --- vl.c | 52 +++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/vl.c b/vl.c index a7b00cd..5026e7a 100644 --- a/vl.c +++ b/vl.c @@ -532,6 +532,27 @@ static QemuOptsList qemu_msg_opts =3D { }, }; =20 +static QemuOptsList qemu_name_opts =3D { + .name =3D "name", + .implied_opt_name =3D "guest", + .merge_lists =3D true, + .head =3D QTAILQ_HEAD_INITIALIZER(qemu_name_opts.head), + .desc =3D { + { + .name =3D "guest", + .type =3D QEMU_OPT_STRING, + .help =3D "Sets the name of the guest.\n" + "This name will be displayed in the SDL window capti= on.\n" + "The name will also be used for the VNC server", + }, { + .name =3D "process", + .type =3D QEMU_OPT_STRING, + .help =3D "Sets the name of the QEMU process, as shown in to= p etc", + }, + { /* End of list */ } + }, +}; + /** * Get machine options * @@ -982,6 +1003,18 @@ static int parse_sandbox(QemuOpts *opts, void *opaq= ue) return 0; } =20 +static void parse_name(QemuOpts *opts) +{ + const char *proc_name; + + qemu_name =3D qemu_opt_get(opts, "guest"); + + proc_name =3D qemu_opt_get(opts, "process"); + if (proc_name) { + os_set_proc_name(proc_name); + } +} + bool usb_enabled(bool default_usb) { return qemu_opt_get_bool(qemu_get_machine_opts(), "usb", default_usb= ); @@ -2915,6 +2948,7 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_tpmdev_opts); qemu_add_opts(&qemu_realtime_opts); qemu_add_opts(&qemu_msg_opts); + qemu_add_opts(&qemu_name_opts); =20 runstate_init(); =20 @@ -3650,19 +3684,11 @@ int main(int argc, char **argv, char **envp) "is no longer supported.\n"); break; case QEMU_OPTION_name: - qemu_name =3D g_strdup(optarg); - { - char *p =3D strchr(qemu_name, ','); - if (p !=3D NULL) { - *p++ =3D 0; - if (strncmp(p, "process=3D", 8)) { - fprintf(stderr, "Unknown subargument %s to -name\n", p); - exit(1); - } - p +=3D 8; - os_set_proc_name(p); - } - } + opts =3D qemu_opts_parse(qemu_find_opts("name"), optarg,= 1); + if (!opts) { + exit(1); + } + parse_name(opts); break; case QEMU_OPTION_prom_env: if (nb_prom_envs >=3D MAX_PROM_ENVS) { --=20 MST