|
 |
9e0a86 |
From f3e59ce7c471d3f0f1f293ecd0ef3e1797ce411f Mon Sep 17 00:00:00 2001
|
|
|
9e0a86 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
9e0a86 |
Date: Sat, 31 Aug 2013 18:25:01 -0400
|
|
|
9e0a86 |
Subject: [PATCH] qapi-types.py: Fix enum struct sizes on i686
|
|
|
9e0a86 |
|
|
|
9e0a86 |
Unlike other list types, enum wasn't adding any padding, which caused
|
|
|
9e0a86 |
a mismatch between the generated struct size and GenericList struct
|
|
|
9e0a86 |
size. More details in a678e26cbe89f7a27cbce794c2c2784571ee9d21
|
|
|
9e0a86 |
|
|
|
9e0a86 |
This crashed qemu if calling qmp query-tpm-types for example, which
|
|
|
9e0a86 |
upsets libvirt capabilities probing. Reproducer on i686:
|
|
|
9e0a86 |
|
|
|
9e0a86 |
(sleep 5; printf '{"execute":"qmp_capabilities"}\n{"execute":"query-tpm-types"}\n') | ./i386-softmmu/qemu-system-i386 -S -nodefaults -nographic -M none -qmp stdio
|
|
|
9e0a86 |
|
|
|
9e0a86 |
https://bugs.launchpad.net/qemu/+bug/1219207
|
|
|
9e0a86 |
|
|
|
9e0a86 |
Cc: qemu-stable@nongnu.org
|
|
|
9e0a86 |
(cherry picked from commit a9d960fb0b1bc104294ab965116a2d53038b4692)
|
|
|
9e0a86 |
---
|
|
|
9e0a86 |
scripts/qapi-types.py | 5 ++++-
|
|
|
9e0a86 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
9e0a86 |
|
|
|
9e0a86 |
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
|
|
|
9e0a86 |
index 5ee46ea..5d31b06 100644
|
|
|
9e0a86 |
--- a/scripts/qapi-types.py
|
|
|
9e0a86 |
+++ b/scripts/qapi-types.py
|
|
|
9e0a86 |
@@ -51,7 +51,10 @@ def generate_fwd_enum_struct(name, members):
|
|
|
9e0a86 |
return mcgen('''
|
|
|
9e0a86 |
typedef struct %(name)sList
|
|
|
9e0a86 |
{
|
|
|
9e0a86 |
- %(name)s value;
|
|
|
9e0a86 |
+ union {
|
|
|
9e0a86 |
+ %(name)s value;
|
|
|
9e0a86 |
+ uint64_t padding;
|
|
|
9e0a86 |
+ };
|
|
|
9e0a86 |
struct %(name)sList *next;
|
|
|
9e0a86 |
} %(name)sList;
|
|
|
9e0a86 |
''',
|