[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/43] qapi: add const prefix to 'char *' insider c_t
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 04/43] qapi: add const prefix to 'char *' insider c_type() |
Date: |
Mon, 23 Jun 2014 12:36:04 -0400 |
From: Amos Kong <address@hidden>
It's ugly to add const prefix for parameter type by an if statement
outside c_type(). This patch adds a parameter to do it.
Signed-off-by: Amos Kong <address@hidden>
Suggested-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
scripts/qapi-commands.py | 4 +---
scripts/qapi.py | 4 +++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 7d93d01..34f200a 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -29,9 +29,7 @@ def type_visitor(name):
def generate_command_decl(name, args, ret_type):
arglist=""
for argname, argtype, optional, structured in parse_args(args):
- argtype = c_type(argtype)
- if argtype == "char *":
- argtype = "const char *"
+ argtype = c_type(argtype, is_param=True)
if optional:
arglist += "bool has_%s, " % c_var(argname)
arglist += "%s %s, " % (argtype, c_var(argname))
diff --git a/scripts/qapi.py b/scripts/qapi.py
index 86e9608..dc690bb 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -470,8 +470,10 @@ def find_enum(name):
def is_enum(name):
return find_enum(name) != None
-def c_type(name):
+def c_type(name, is_param=False):
if name == 'str':
+ if is_param:
+ return 'const char *'
return 'char *'
elif name == 'int':
return 'int64_t'
--
1.9.3
- [Qemu-devel] [PULL 28/43] qapi event: convert BLOCK_IMAGE_CORRUPTED, (continued)
- [Qemu-devel] [PULL 28/43] qapi event: convert BLOCK_IMAGE_CORRUPTED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 30/43] qapi event: convert NIC_RX_FILTER_CHANGED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 31/43] qapi event: convert VNC events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 33/43] qmp: convert ACPI_DEVICE_OST event, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 35/43] qapi event: convert GUEST_PANICKED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 36/43] qapi event: convert QUORUM events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 38/43] qemu-char: introduce qemu_chr_alloc, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 40/43] qemu-char: move pty_chr_update_read_handler around, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 05/43] qapi: Suppress unwanted space between type and identifier, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 41/43] qemu-char: make writes thread-safe, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 04/43] qapi: add const prefix to 'char *' insider c_type(),
Luiz Capitulino <=
- [Qemu-devel] [PULL 10/43] qapi script: add event support, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 34/43] qapi event: convert BALLOON_CHANGE, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 25/43] qapi event: convert DEVICE_DELETED, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 16/43] qapi event: convert POWERDOWN, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 29/43] qapi event: convert other BLOCK_JOB events, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 09/43] qapi: add event helper functions, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 19/43] qapi event: convert RESUME, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 42/43] monitor: protect outbuf and mux_out with mutex, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 21/43] qapi event: convert SUSPEND_DISK, Luiz Capitulino, 2014/06/23
- [Qemu-devel] [PULL 24/43] qapi event: convert WATCHDOG, Luiz Capitulino, 2014/06/23