aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-05-31 11:32:32 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-31 11:32:32 -0500
commit6c8df7a33ade90c8c96b01655520c7e9b69b46c0 (patch)
tree89f190b13b95255c228a7fbaed3f6dedf4bf06a5 /include
parentcdf79b6454abe13aec89d4be7cf59b3e841a7faf (diff)
parentbff63471ced94e3a6de76b1a7375a875178d6cdc (diff)
downloadqemu-6c8df7a33ade90c8c96b01655520c7e9b69b46c0.zip
qemu-6c8df7a33ade90c8c96b01655520c7e9b69b46c0.tar.gz
qemu-6c8df7a33ade90c8c96b01655520c7e9b69b46c0.tar.bz2
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 'include')
-rw-r--r--include/qapi/visitor.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/qapi/visitor.h b/include/qapi/visitor.h
index 1fef18c..28c21d8 100644
--- a/include/qapi/visitor.h
+++ b/include/qapi/visitor.h
@@ -18,7 +18,10 @@
typedef struct GenericList
{
- void *value;
+ union {
+ void *value;
+ uint64_t padding;
+ };
struct GenericList *next;
} GenericList;