haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qlit: Change compound literals to initializers

Browse source 
The QLIT_QFOO() macros expand into compound literals.  Sadly, gcc
doesn't recognizes these as constant expressions (clang does), which
makes the macros useless for initializing objects with static storage
duration.

There is a gcc bug about it:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71713

Change the macros to expand into initializers.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170825105913.4060-5-marcandre.lureau@redhat.com>
[Commit message improved]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2017-08-25 12:59:03 +02:00 committed by Markus Armbruster
parent 082696e767
commit d5cd8fbf13
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/qapi/qmp/qlit.h
View file

@ -36,13 +36,13 @@ struct QLitDictEntry {
};
#define QLIT_QNUM(val) \
(QLitObject){.type = QTYPE_QNUM, .value.qnum = (val)}
{ .type = QTYPE_QNUM, .value.qnum = (val) }
#define QLIT_QSTR(val) \
(QLitObject){.type = QTYPE_QSTRING, .value.qstr = (val)}
{ .type = QTYPE_QSTRING, .value.qstr = (val) }
#define QLIT_QDICT(val) \
(QLitObject){.type = QTYPE_QDICT, .value.qdict = (val)}
{ .type = QTYPE_QDICT, .value.qdict = (val) }
#define QLIT_QLIST(val) \
(QLitObject){.type = QTYPE_QLIST, .value.qlist = (val)}
{ .type = QTYPE_QLIST, .value.qlist = (val) }
int compare_litqobj_to_qobj(QLitObject *lhs, QObject *rhs);