Commit 02dc4bf5 authored by Cole Robinson's avatar Cole Robinson Committed by Luiz Capitulino
Browse files

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 a678e26c

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@nongnu.org
Signed-off-by: default avatarCole Robinson <crobinso@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Tested-by: default avatarRichard W.M. Jones <rjones@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 94c2b6af

scripts/qapi-types.py

+4 −1
Original line number Diff line number Diff line
@@ -51,7 +51,10 @@ def generate_fwd_enum_struct(name, members): 
    return mcgen('''

typedef struct %(name)sList

{

    union {

        %(name)s value;

        uint64_t padding;

    };

    struct %(name)sList *next;

} %(name)sList;

''',