|
 |
9ae3a8 |
From 798796e641d7e1146b9d6679958f8264efd1494e Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Date: Tue, 5 Nov 2013 14:08:55 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 42/87] qapi-types.py: Split off generate_struct_fields()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1383660558-32096-2-git-send-email-kwolf@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55380
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.0 qemu-kvm PATCH 01/24] qapi-types.py: Split off generate_struct_fields()
|
|
|
9ae3a8 |
Bugzilla: 978402
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 015370301fd90ea5d17522eba00ae2797569ce8b)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/qapi-types.py | 19 +++++++++++++------
|
|
|
9ae3a8 |
1 file changed, 13 insertions(+), 6 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
scripts/qapi-types.py | 19 +++++++++++++------
|
|
|
9ae3a8 |
1 files changed, 13 insertions(+), 6 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
|
|
|
9ae3a8 |
index 20f4bdf..e9bd638 100644
|
|
|
9ae3a8 |
--- a/scripts/qapi-types.py
|
|
|
9ae3a8 |
+++ b/scripts/qapi-types.py
|
|
|
9ae3a8 |
@@ -51,12 +51,8 @@ typedef struct %(name)sList
|
|
|
9ae3a8 |
''',
|
|
|
9ae3a8 |
name=name)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-def generate_struct(structname, fieldname, members):
|
|
|
9ae3a8 |
- ret = mcgen('''
|
|
|
9ae3a8 |
-struct %(name)s
|
|
|
9ae3a8 |
-{
|
|
|
9ae3a8 |
-''',
|
|
|
9ae3a8 |
- name=structname)
|
|
|
9ae3a8 |
+def generate_struct_fields(members):
|
|
|
9ae3a8 |
+ ret = ''
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
for argname, argentry, optional, structured in parse_args(members):
|
|
|
9ae3a8 |
if optional:
|
|
|
9ae3a8 |
@@ -74,6 +70,17 @@ struct %(name)s
|
|
|
9ae3a8 |
''',
|
|
|
9ae3a8 |
c_type=c_type(argentry), c_name=c_var(argname))
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ return ret
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+def generate_struct(structname, fieldname, members):
|
|
|
9ae3a8 |
+ ret = mcgen('''
|
|
|
9ae3a8 |
+struct %(name)s
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+''',
|
|
|
9ae3a8 |
+ name=structname)
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ ret += generate_struct_fields(members)
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
if len(fieldname):
|
|
|
9ae3a8 |
fieldname = " " + fieldname
|
|
|
9ae3a8 |
ret += mcgen('''
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|