From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-block@nongnu.org, kwolf@redhat.com, pkrempa@redhat.com,
eblake@redhat.com,
"mdroth@linux.vnet.ibm.commdroth"@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 22/24] qapi: New parse_qapi_name()
Date: Mon, 27 Feb 2017 12:20:48 +0100 [thread overview]
Message-ID: <1488194450-28056-23-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1488194450-28056-1-git-send-email-armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
include/qapi/util.h | 2 ++
qapi/qapi-util.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++
tests/test-qapi-util.c | 34 ++++++++++++++++++++++++++++++++++
3 files changed, 83 insertions(+)
diff --git a/include/qapi/util.h b/include/qapi/util.h
index 7ad26c0..7436ed8 100644
--- a/include/qapi/util.h
+++ b/include/qapi/util.h
@@ -14,4 +14,6 @@
int qapi_enum_parse(const char * const lookup[], const char *buf,
int max, int def, Error **errp);
+int parse_qapi_name(const char *name, bool complete);
+
#endif
diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
index 818730a..53b27e2 100644
--- a/qapi/qapi-util.c
+++ b/qapi/qapi-util.c
@@ -33,3 +33,50 @@ int qapi_enum_parse(const char * const lookup[], const char *buf,
error_setg(errp, "invalid parameter value: %s", buf);
return def;
}
+
+/*
+ * Parse a valid QAPI name from @str.
+ * A valid name consists of letters, digits, hyphen and underscore.
+ * It may be prefixed by __RFQDN_ (downstream extension), where RFQDN
+ * may contain only letters, digits and hyphen.
+ * The special exception for enumeration names is not implemented.
+ * See docs/qapi-code-gen.txt for more on QAPI naming rules.
+ * Keep this consistent with scripts/qapi.py!
+ * If @complete, the parse fails unless it consumes @str completely.
+ * Return its length on success, -1 on failure.
+ */
+int parse_qapi_name(const char *str, bool complete)
+{
+ const char *p = str;
+
+ if (*p == '_') { /* Downstream __RFQDN_ */
+ p++;
+ if (*p != '_') {
+ return -1;
+ }
+ while (*++p) {
+ if (!qemu_isalnum(*p) && *p != '-' && *p != '.') {
+ break;
+ }
+ }
+
+ if (*p != '_') {
+ return -1;
+ }
+ p++;
+ }
+
+ if (!qemu_isalpha(*p)) {
+ return -1;
+ }
+ while (*++p) {
+ if (!qemu_isalnum(*p) && *p != '-' && *p != '_') {
+ break;
+ }
+ }
+
+ if (complete && *p) {
+ return -1;
+ }
+ return p - str;
+}
diff --git a/tests/test-qapi-util.c b/tests/test-qapi-util.c
index 39db8bf..e869757 100644
--- a/tests/test-qapi-util.c
+++ b/tests/test-qapi-util.c
@@ -42,10 +42,44 @@ static void test_qapi_enum_parse(void)
g_assert_cmpint(ret, ==, QTYPE__MAX - 1);
}
+static void test_parse_qapi_name(void)
+{
+ int ret;
+
+ /* Must start with a letter */
+ ret = parse_qapi_name("a", true);
+ g_assert(ret == 1);
+ ret = parse_qapi_name("a$", false);
+ g_assert(ret == 1);
+ ret = parse_qapi_name("", false);
+ g_assert(ret == -1);
+ ret = parse_qapi_name("1", false);
+ g_assert(ret == -1);
+
+ /* Only letters, digits, hyphen, underscore */
+ ret = parse_qapi_name("A-Za-z0-9_", true);
+ g_assert(ret == 10);
+ ret = parse_qapi_name("A-Za-z0-9_$", false);
+ g_assert(ret == 10);
+ ret = parse_qapi_name("A-Za-z0-9_$", true);
+ g_assert(ret == -1);
+
+ /* __RFQDN_ */
+ ret = parse_qapi_name("__com.redhat_supports", true);
+ g_assert(ret == 21);
+ ret = parse_qapi_name("_com.example_", false);
+ g_assert(ret == -1);
+ ret = parse_qapi_name("__com.example", false);
+ g_assert(ret == -1);
+ ret = parse_qapi_name("__com.example_", false);
+ g_assert(ret == -1);
+}
+
int main(int argc, char *argv[])
{
g_test_init(&argc, &argv, NULL);
g_test_add_func("/qapi/util/qapi_enum_parse", test_qapi_enum_parse);
+ g_test_add_func("/qapi/util/parse_qapi_name", test_parse_qapi_name);
g_test_run();
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2017-02-27 11:21 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-27 11:20 [Qemu-devel] [PATCH 00/24] block: Command line option -blockdev Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 01/24] test-qemu-opts: Cover qemu_opts_parse() of "no" Markus Armbruster
2017-02-28 15:34 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 02/24] tests: Fix gcov-files-test-qemu-opts-y, gcov-files-test-logging-y Markus Armbruster
2017-02-28 15:34 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 03/24] keyval: New keyval_parse() Markus Armbruster
2017-02-28 15:48 ` Kevin Wolf
2017-02-28 16:36 ` Markus Armbruster
2017-02-28 16:57 ` Eric Blake
2017-02-28 18:03 ` Markus Armbruster
2017-02-28 18:51 ` Eric Blake
2017-02-28 19:15 ` Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 04/24] qapi: qobject input visitor variant for use with keyval_parse() Markus Armbruster
2017-02-28 16:03 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 05/24] test-keyval: Cover use with qobject input visitor Markus Armbruster
2017-02-28 16:21 ` Kevin Wolf
2017-02-28 18:04 ` Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 06/24] qapi: Factor out common part of qobject input visitor creation Markus Armbruster
2017-02-28 16:24 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 07/24] qapi: Factor out common qobject_input_get_keyval() Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 08/24] qobject: Propagate parse errors through qobject_from_jsonv() Markus Armbruster
2017-02-28 16:32 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 09/24] libqtest: Fix qmp() & friends to abort on JSON parse errors Markus Armbruster
2017-02-28 16:51 ` Kevin Wolf
2017-02-28 18:05 ` Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 10/24] qjson: Abort earlier on qobject_from_jsonf() misuse Markus Armbruster
2017-02-28 16:51 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 11/24] test-qobject-input-visitor: Abort earlier on bad test input Markus Armbruster
2017-02-28 16:52 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 12/24] qobject: Propagate parse errors through qobject_from_json() Markus Armbruster
2017-02-28 16:55 ` Kevin Wolf
2017-02-28 19:19 ` Eric Blake
2017-02-28 19:48 ` Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 13/24] block: More detailed syntax error reporting for JSON filenames Markus Armbruster
2017-02-28 16:58 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 14/24] check-qjson: Test errors from qobject_from_json() Markus Armbruster
2017-02-28 17:06 ` Kevin Wolf
2017-02-28 19:25 ` Eric Blake
2017-02-28 19:52 ` Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 15/24] test-visitor-serialization: Pass &error_abort to qobject_from_json() Markus Armbruster
2017-02-28 17:09 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 16/24] monitor: Assert qmp_schema_json[] is sane Markus Armbruster
2017-02-28 17:11 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 17/24] qapi: New qobject_input_visitor_new_str() for convenience Markus Armbruster
2017-02-28 17:18 ` Kevin Wolf
2017-02-28 18:48 ` Markus Armbruster
2017-02-28 19:29 ` Kevin Wolf
2017-02-28 17:33 ` Kevin Wolf
2017-02-28 18:45 ` Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 18/24] block: Initial implementation of -blockdev Markus Armbruster
2017-02-28 19:38 ` Eric Blake
2017-02-28 19:57 ` Kevin Wolf
2017-02-28 20:59 ` Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 19/24] qapi: Improve how keyval input visitor reports unexpected dicts Markus Armbruster
2017-02-28 17:51 ` Kevin Wolf
2017-02-28 18:52 ` Markus Armbruster
2017-02-27 11:20 ` [Qemu-devel] [PATCH 20/24] docs/qapi-code-gen.txt: Clarify naming rules Markus Armbruster
2017-02-28 17:54 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 21/24] test-qapi-util: New, covering qapi/qapi-util.c Markus Armbruster
2017-02-28 17:57 ` Kevin Wolf
2017-02-27 11:20 ` Markus Armbruster [this message]
2017-02-28 18:02 ` [Qemu-devel] [PATCH 22/24] qapi: New parse_qapi_name() Kevin Wolf
2017-02-28 18:54 ` Markus Armbruster
2017-02-28 19:48 ` Eric Blake
2017-02-27 11:20 ` [Qemu-devel] [PATCH 23/24] keyval: Restrict key components to valid QAPI names Markus Armbruster
2017-02-28 18:06 ` Kevin Wolf
2017-02-27 11:20 ` [Qemu-devel] [PATCH 24/24] keyval: Support lists Markus Armbruster
2017-02-28 19:25 ` Kevin Wolf
2017-02-28 19:58 ` Markus Armbruster
2017-02-28 20:06 ` Eric Blake
2017-02-28 21:04 ` Markus Armbruster
2017-02-28 16:25 ` [Qemu-devel] [PATCH 00/24] block: Command line option -blockdev Eric Blake
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=1488194450-28056-23-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc="mdroth@linux.vnet.ibm.commdroth"@linux.vnet.ibm.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=pkrempa@redhat.com \
--cc=qemu-block@nongnu.org \
--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: 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).