[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 29/32] qapi/options: QAPIfy --echr argument type
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [RFC PATCH 29/32] qapi/options: QAPIfy --echr argument type |
Date: |
Mon, 2 Oct 2017 17:25:49 +0200 |
Bonus: more rigorous error checking. Crap like '-echar 666' and
'-echar 0x' are now rejected.
FIXME the error messages are crap:
qemu-system-x86_64: -echr 666: Parameter 'null' expects int8_t
qemu-system-x86_64: -echr 0x: Parameter '<anonymous>' expects integer
Signed-off-by: Markus Armbruster <address@hidden>
---
qapi/options.json | 2 +-
vl.c | 10 ++--------
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/qapi/options.json b/qapi/options.json
index 5a8fdc04ad..853908560d 100644
--- a/qapi/options.json
+++ b/qapi/options.json
@@ -3892,7 +3892,7 @@
# !end texinfo
##
{ 'option': '--echr',
- 'data': 'str', # FIXME int
+ 'data': 'int8',
'help': "-echr chr set terminal escape character instead of ctrl-a" }
##
diff --git a/vl.c b/vl.c
index b9524f7e11..4af2905c60 100644
--- a/vl.c
+++ b/vl.c
@@ -3574,14 +3574,8 @@ int main(int argc, char **argv, char **envp)
}
break;
case QAPI_OPTION_KIND_ECHR:
- {
- char *r;
- term_escape_char = strtol(qopt[i].u.echr.data, &r, 0);
- if (r == qopt[i].u.echr.data) {
- printf("Bad argument to echr\n");
- }
- break;
- }
+ term_escape_char = qopt[i].u.echr.data;
+ break;
case QAPI_OPTION_KIND_MONITOR:
default_monitor = 0;
if (strncmp(qopt[i].u.monitor.data, "none", 4)) {
--
2.13.6
- Re: [Qemu-devel] [RFC PATCH 16/32] qapi: Factor out _make_implicit_wrapper_type(), (continued)
- [Qemu-devel] [RFC PATCH 01/32] tests/qapi-schema: Improve coverage of '@', Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 04/32] qapi2texi: Fix for '@' not followed by \w character, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 09/32] qapi: check_type() parameter allow_optional is now unused, drop, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 13/32] qapi: Use argparse to open schema file, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 06/32] qapi2texi: Drop | example markup, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 29/32] qapi/options: QAPIfy --echr argument type,
Markus Armbruster <=
- [Qemu-devel] [RFC PATCH 32/32] qapi/options: QAPIfy --add-fd argument type, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 22/32] qapi: New helper c_string(), Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 30/32] qapi/options: QAPIfy --watchdog-action argument type, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 08/32] qapi: Simplify check_name() parameters, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 10/32] qapi: Don't run generators twice, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 31/32] qapi/options: QAPIfy --blockdev argument type, Markus Armbruster, 2017/10/02
- [Qemu-devel] [RFC PATCH 05/32] qapi2texi: Provide access to Texinfo markup, Markus Armbruster, 2017/10/02