[Xen-changelog] [qemu-upstream-unstable] qapi-types.py: Fix enum struct sizes on i686

[patchbot@xxxxxxx]

commit 8b4b3a71fd35d67c5c30652a120c0a59dfab7182
Author:     Cole Robinson <crobinso@xxxxxxxxxx>
AuthorDate: Sat Aug 31 18:36:17 2013 -0400
Commit:     Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
CommitDate: Tue Sep 24 22:50:13 2013 -0500

    qapi-types.py: Fix enum struct sizes on i686
    
    Unlike other list types, enum wasn't adding any padding, which caused
    a mismatch between the generated struct size and GenericList struct
    size. More details in a678e26cbe89f7a27cbce794c2c2784571ee9d21
    
    This crashed qemu if calling qmp query-tpm-types for example, which
    upsets libvirt capabilities probing. Reproducer on i686:
    
    (sleep 5; printf 
'{"execute":"qmp_capabilities"}\n{"execute":"query-tpm-types"}\n') | 
./i386-softmmu/qemu-system-i386 -S -nodefaults -nographic -M none -qmp stdio
    
    https://bugs.launchpad.net/qemu/+bug/1219207
    
    Cc: qemu-stable@xxxxxxxxxx
    Signed-off-by: Cole Robinson <crobinso@xxxxxxxxxx>
    Reviewed-by: Eric Blake <eblake@xxxxxxxxxx>
    Tested-by: Richard W.M. Jones <rjones@xxxxxxxxxx>
    Signed-off-by: Luiz Capitulino <lcapitulino@xxxxxxxxxx>
    (cherry picked from commit 02dc4bf5684d3fb46786fab2ecff98214b1df9fe)
    
    Signed-off-by: Michael Roth <mdroth@xxxxxxxxxxxxxxxxxx>
---
 scripts/qapi-types.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 5ee46ea..5d31b06 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;
 ''',
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog