aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <anthony@codemonkey.ws>2013-09-11 14:46:44 -0500
committerAnthony Liguori <anthony@codemonkey.ws>2013-09-11 14:46:44 -0500
commit6f52e51bb7706562634e5dd2755a1e9b8a5037cc (patch)
treebc88a7ed2a8f45167af8f65501a3f6d620ba5c85
parentd985bd4d55555a06c4239eadba4e367880e938ba (diff)
parent02dc4bf5684d3fb46786fab2ecff98214b1df9fe (diff)
downloadqemu-arm-6f52e51bb7706562634e5dd2755a1e9b8a5037cc.tar.gz
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Cole Robinson # Via Luiz Capitulino * luiz/queue/qmp: qapi-types.py: Fix enum struct sizes on i686 Message-id: 1378822364-13887-1-git-send-email-lcapitulino@redhat.com Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
-rw-r--r--scripts/qapi-types.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 86de9800ea..5222463893 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -51,7 +51,10 @@ def generate_fwd_enum_struct(name, members):
return mcgen('''
typedef struct %(name)sList
{
- %(name)s value;
+ union {
+ %(name)s value;
+ uint64_t padding;
+ };
struct %(name)sList *next;
} %(name)sList;
''',