From: Wei Yang <richardw.yang@linux.intel.com> To: qemu-devel@nongnu.org Cc: ehabkost@redhat.com, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH v2 4/4] vl: Simplify machine_parse() Date: Fri, 5 Apr 2019 14:41:21 +0800 [thread overview] Message-ID: <20190405064121.23662-5-richardw.yang@linux.intel.com> (raw) In-Reply-To: <20190405064121.23662-1-richardw.yang@linux.intel.com> From: Markus Armbruster <armbru@redhat.com> Exploit that argument @name is nerver null. Check is_help_option() first, because that's what we do elsewhere. If we (foolishly!) defined a machine named "help", -machine help would now print help instead of selecting the machine named "help". Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Wei Yang <richardw.yang@linux.intel.com> --- vl.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/vl.c b/vl.c index 99f9cb2533..4f4d440bc4 100644 --- a/vl.c +++ b/vl.c @@ -2529,19 +2529,10 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) static MachineClass *machine_parse(const char *name, GSList *machines) { - MachineClass *mc = NULL; + MachineClass *mc; GSList *el; - if (name) { - mc = find_machine(name, machines); - } - if (mc) { - return mc; - } - if (name && !is_help_option(name)) { - error_report("unsupported machine type"); - error_printf("Use -machine help to list supported machines\n"); - } else { + if (is_help_option(name)) { printf("Supported machines are:\n"); machines = g_slist_sort(machines, machine_class_cmp); for (el = machines; el; el = el->next) { @@ -2553,9 +2544,16 @@ static MachineClass *machine_parse(const char *name, GSList *machines) mc->is_default ? " (default)" : "", mc->deprecation_reason ? " (deprecated)" : ""); } + exit(0); } - exit(!name || !is_help_option(name)); + mc = find_machine(name, machines); + if (!mc) { + error_report("unsupported machine type"); + error_printf("Use -machine help to list supported machines\n"); + exit(1); + } + return mc; } void qemu_add_exit_notifier(Notifier *notify) -- 2.19.1
WARNING: multiple messages have this Message-ID (diff)
From: Wei Yang <richardw.yang@linux.intel.com> To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, ehabkost@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH v2 4/4] vl: Simplify machine_parse() Date: Fri, 5 Apr 2019 14:41:21 +0800 [thread overview] Message-ID: <20190405064121.23662-5-richardw.yang@linux.intel.com> (raw) Message-ID: <20190405064121.qVW7PRsZh69enxItyBu0TiIO6_ZZvMMzRtqnxaoEf9M@z> (raw) In-Reply-To: <20190405064121.23662-1-richardw.yang@linux.intel.com> From: Markus Armbruster <armbru@redhat.com> Exploit that argument @name is nerver null. Check is_help_option() first, because that's what we do elsewhere. If we (foolishly!) defined a machine named "help", -machine help would now print help instead of selecting the machine named "help". Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Wei Yang <richardw.yang@linux.intel.com> --- vl.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/vl.c b/vl.c index 99f9cb2533..4f4d440bc4 100644 --- a/vl.c +++ b/vl.c @@ -2529,19 +2529,10 @@ static gint machine_class_cmp(gconstpointer a, gconstpointer b) static MachineClass *machine_parse(const char *name, GSList *machines) { - MachineClass *mc = NULL; + MachineClass *mc; GSList *el; - if (name) { - mc = find_machine(name, machines); - } - if (mc) { - return mc; - } - if (name && !is_help_option(name)) { - error_report("unsupported machine type"); - error_printf("Use -machine help to list supported machines\n"); - } else { + if (is_help_option(name)) { printf("Supported machines are:\n"); machines = g_slist_sort(machines, machine_class_cmp); for (el = machines; el; el = el->next) { @@ -2553,9 +2544,16 @@ static MachineClass *machine_parse(const char *name, GSList *machines) mc->is_default ? " (default)" : "", mc->deprecation_reason ? " (deprecated)" : ""); } + exit(0); } - exit(!name || !is_help_option(name)); + mc = find_machine(name, machines); + if (!mc) { + error_report("unsupported machine type"); + error_printf("Use -machine help to list supported machines\n"); + exit(1); + } + return mc; } void qemu_add_exit_notifier(Notifier *notify) -- 2.19.1
next prev parent reply other threads:[~2019-04-05 6:42 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-05 6:41 [Qemu-devel] [PATCH v2 0/4] cleanup select_machine Wei Yang 2019-04-05 6:41 ` Wei Yang 2019-04-05 6:41 ` [Qemu-devel] [PATCH v2 1/4] vl.c: make find_default_machine() local Wei Yang 2019-04-05 6:41 ` Wei Yang 2019-04-08 8:59 ` Markus Armbruster 2019-04-08 8:59 ` Markus Armbruster 2019-04-05 6:41 ` [Qemu-devel] [PATCH v2 2/4] vl.c: allocate TYPE_MACHINE list once during bootup Wei Yang 2019-04-05 6:41 ` Wei Yang 2019-04-05 6:41 ` [Qemu-devel] [PATCH v2 3/4] vl: Clean up after previous commit Wei Yang 2019-04-05 6:41 ` Wei Yang 2019-04-05 6:41 ` Wei Yang [this message] 2019-04-05 6:41 ` [Qemu-devel] [PATCH v2 4/4] vl: Simplify machine_parse() Wei Yang 2019-04-12 20:42 ` [Qemu-devel] [PATCH v2 0/4] cleanup select_machine Eduardo Habkost 2019-04-12 20:42 ` Eduardo Habkost
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190405064121.23662-5-richardw.yang@linux.intel.com \ --to=richardw.yang@linux.intel.com \ --cc=armbru@redhat.com \ --cc=ehabkost@redhat.com \ --cc=marcel.apfelbaum@gmail.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.