diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-31 11:32:32 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-31 11:32:32 -0500 |
| commit | 6c8df7a33ade90c8c96b01655520c7e9b69b46c0 (patch) | |
| tree | 89f190b13b95255c228a7fbaed3f6dedf4bf06a5 /scripts/qapi-types.py | |
| parent | cdf79b6454abe13aec89d4be7cf59b3e841a7faf (diff) | |
| parent | bff63471ced94e3a6de76b1a7375a875178d6cdc (diff) | |
| download | focaccia-qemu-6c8df7a33ade90c8c96b01655520c7e9b69b46c0.tar.gz focaccia-qemu-6c8df7a33ade90c8c96b01655520c7e9b69b46c0.zip | |
Merge remote-tracking branch 'luiz/queue/qmp' into staging
# By Luiz Capitulino (1) and others # Via Luiz Capitulino * luiz/queue/qmp: target-i386: Fix mask of pte index in memory mapping target-i386: fix abort on bad PML4E/PDPTE/PDE/PTE addresses qapi: pad GenericList value fields to 64 bits Message-id: 1370009905-4255-1-git-send-email-lcapitulino@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'scripts/qapi-types.py')
| -rw-r--r-- | scripts/qapi-types.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index fd42d71da1..ddcfed9f4b 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -22,7 +22,10 @@ def generate_fwd_struct(name, members, builtin_type=False): typedef struct %(name)sList { - %(type)s value; + union { + %(type)s value; + uint64_t padding; + }; struct %(name)sList *next; } %(name)sList; ''', @@ -35,7 +38,10 @@ typedef struct %(name)s %(name)s; typedef struct %(name)sList { - %(name)s *value; + union { + %(name)s *value; + uint64_t padding; + }; struct %(name)sList *next; } %(name)sList; ''', |