summaryrefslogtreecommitdiffstats
path: root/tests/qapi-schema
diff options
context:
space:
mode:
authorMarkus Armbruster2019-09-27 15:46:25 +0200
committerMarkus Armbruster2019-09-28 17:17:19 +0200
commit67fa64ce0ef92943a25de0f0760f8cfc10c2bbf3 (patch)
tree2ea0aee90884c849a978fdacdcc3d6b36ee3403c /tests/qapi-schema
parentqapi: Report invalid '*' prefix like any other invalid name (diff)
downloadqemu-67fa64ce0ef92943a25de0f0760f8cfc10c2bbf3.tar.gz
qemu-67fa64ce0ef92943a25de0f0760f8cfc10c2bbf3.tar.xz
qemu-67fa64ce0ef92943a25de0f0760f8cfc10c2bbf3.zip
qapi: Move check for reserved names out of add_name()
The checks for reserved names are spread far and wide. Move one from add_name() to new check_defn_name_str(). This is a first step towards collecting them all in dedicated name checking functions next to check_name(). While there, drop the quotes around the meta-type in check_name_str()'s error messages: "'command' uses ... name 'NAME'" becomes "command uses ... name 'NAME'". Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20190927134639.4284-13-armbru@redhat.com>
Diffstat (limited to 'tests/qapi-schema')
-rw-r--r--tests/qapi-schema/bad-ident.err2
-rw-r--r--tests/qapi-schema/reserved-command-q.err2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/qapi-schema/bad-ident.err b/tests/qapi-schema/bad-ident.err
index ddc96bd3a9..79d14758ce 100644
--- a/tests/qapi-schema/bad-ident.err
+++ b/tests/qapi-schema/bad-ident.err
@@ -1,2 +1,2 @@
tests/qapi-schema/bad-ident.json: In struct '*oops':
-tests/qapi-schema/bad-ident.json:2: 'struct' uses invalid name '*oops'
+tests/qapi-schema/bad-ident.json:2: struct uses invalid name '*oops'
diff --git a/tests/qapi-schema/reserved-command-q.err b/tests/qapi-schema/reserved-command-q.err
index 0844e14b26..631cb5cdcc 100644
--- a/tests/qapi-schema/reserved-command-q.err
+++ b/tests/qapi-schema/reserved-command-q.err
@@ -1,2 +1,2 @@
tests/qapi-schema/reserved-command-q.json: In command 'q-unix':
-tests/qapi-schema/reserved-command-q.json:5: 'command' uses invalid name 'q-unix'
+tests/qapi-schema/reserved-command-q.json:5: command uses invalid name 'q-unix'