On 04/25/18 00:03, no-re...@patchew.org wrote: > Hi, > > This series failed docker-mingw@fedora build test. Please find the testing > commands and > their output below. If you have Docker installed, you can probably reproduce > it > locally.
[snip] > qapi/qapi-types-misc.h:654:20: error: expected identifier or '(' before > numeric constant > CpuInfoX86 i386; > ^ > qapi/qapi-types-misc.h:749:22: error: expected identifier or '(' before > numeric constant > CpuInfoOther i386; > ^ > make: *** [/tmp/qemu-test/src/rules.mak:66: qapi/qapi-types-misc.o] Error 1 > make: *** Waiting for unfinished jobs.... > qapi/qapi-types-misc.h:654:20: error: expected identifier or '(' before > numeric constant > CpuInfoX86 i386; > ^ > qapi/qapi-types-misc.h:749:22: error: expected identifier or '(' before > numeric constant > CpuInfoOther i386; > ^ > make: *** [/tmp/qemu-test/src/rules.mak:66: qapi/qapi-types.o] Error 1 > qapi/qapi-types-misc.h:654:20: error: expected identifier or '(' before > numeric constant > CpuInfoX86 i386; > ^ > qapi/qapi-types-misc.h:749:22: error: expected identifier or '(' before > numeric constant > CpuInfoOther i386; > ^ Wow, is "i386" a macro on mingw, one that expands to a number? That is incredibly st...range. I do need this enum constant to be "i386" in the QAPI schema, because that's what TARGET_NAME will map to. Can I let the generator use the "q_" prefix here somehow? Hmm, I think that trick is already happening for "sparc": 641 struct CpuInfo { 642 /* Members inherited from CpuInfoBase: */ 643 char *qom_path; 644 int64_t thread_id; 645 bool has_props; 646 CpuInstanceProperties *props; 647 CpuInfoArch arch; 648 int64_t CPU; 649 bool current; 650 bool halted; 651 SysEmuTarget target; 652 /* Own members: */ 653 union { /* union tag is @target */ 654 CpuInfoX86 i386; 655 CpuInfoX86 x86_64; 656 CpuInfoSPARC q_sparc; <----------------- here Alright, I'll add "i386" to "polluted_words" in "scripts/qapi/common.py". Sigh, what else is there already... I see Eric's commit 86ae191163d4 :( Laszlo