From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, famz@redhat.com, armbru@redhat.com,
mreitz@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v2 1/6] qemu-option: Introduce has_help_option()
Date: Thu, 20 Feb 2014 15:57:18 +0100 [thread overview]
Message-ID: <1392908243-8835-2-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1392908243-8835-1-git-send-email-kwolf@redhat.com>
This new function checks if any help option ('help' or '?') occurs
anywhere in an option string, so that things like 'cluster_size=4k,help'
are recognised.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
include/qemu/option.h | 1 +
util/qemu-option.c | 24 ++++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/include/qemu/option.h b/include/qemu/option.h
index 3ea871a..8d44167 100644
--- a/include/qemu/option.h
+++ b/include/qemu/option.h
@@ -79,6 +79,7 @@ void parse_option_size(const char *name, const char *value,
void free_option_parameters(QEMUOptionParameter *list);
void print_option_parameters(QEMUOptionParameter *list);
void print_option_help(QEMUOptionParameter *list);
+bool has_help_option(const char *param);
/* ------------------------------------------------------------------ */
diff --git a/util/qemu-option.c b/util/qemu-option.c
index 668e5d9..ce1eba8 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -450,6 +450,30 @@ fail:
return NULL;
}
+bool has_help_option(const char *param)
+{
+ size_t buflen = strlen(param) + 1;
+ char *buf = g_malloc0(buflen);
+ const char *p = param;
+ bool result = false;
+
+ while (*p) {
+ p = get_opt_value(buf, buflen, p);
+ if (*p) {
+ p++;
+ }
+
+ if (is_help_option(buf)) {
+ result = true;
+ goto out;
+ }
+ }
+
+out:
+ free(buf);
+ return result;
+}
+
/*
* Prints all options of a list that have a value to stdout
*/
--
1.8.1.4
next prev parent reply other threads:[~2014-02-20 14:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-20 14:57 [Qemu-devel] [PATCH v2 0/6] qemu-img: Support multiple -o options Kevin Wolf
2014-02-20 14:57 ` Kevin Wolf [this message]
2014-02-20 15:28 ` [Qemu-devel] [PATCH v2 1/6] qemu-option: Introduce has_help_option() Eric Blake
2014-02-20 20:21 ` Jeff Cody
2014-02-20 14:57 ` [Qemu-devel] [PATCH v2 2/6] qemu-img create: Support multiple -o options Kevin Wolf
2014-02-20 15:52 ` Eric Blake
2014-02-20 16:24 ` Eric Blake
2014-02-20 19:14 ` Jeff Cody
2014-02-20 14:57 ` [Qemu-devel] [PATCH v2 3/6] qemu-img convert: " Kevin Wolf
2014-02-20 16:01 ` Eric Blake
2014-02-20 19:33 ` Jeff Cody
2014-02-20 19:38 ` Eric Blake
2014-02-20 14:57 ` [Qemu-devel] [PATCH v2 4/6] qemu-img amend: " Kevin Wolf
2014-02-20 16:18 ` Eric Blake
2014-02-20 19:39 ` Jeff Cody
2014-02-20 14:57 ` [Qemu-devel] [PATCH v2 5/6] qemu-img: Allow -o help with incomplete argument list Kevin Wolf
2014-02-20 16:58 ` Eric Blake
2014-02-20 20:05 ` Jeff Cody
2014-02-20 14:57 ` [Qemu-devel] [PATCH v2 6/6] qemu-iotests: Check qemu-img command line parsing Kevin Wolf
2014-02-20 17:51 ` Eric Blake
2014-02-20 18:42 ` Jeff Cody
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=1392908243-8835-2-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=armbru@redhat.com \
--cc=famz@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).