Hi Alex, Here's a polished and squashed series of POWERPC_DEF() QOM'ifications. In light of David's patch I am sending this out in the hope that it can be applied to ppc-next before David's significantly smaller patch gets applied (or that you take care of rebasing yourself).
It is based on (and depends on) the two for-1.4 fixes I sent out yesterday. Further QOM'ifying the glue(..., _type) stuff is intended as follow-up. Conflicts: * Comma on all macro definitions gets removed in patch 1. * "Trident" definition gets moved to aliases list in patch 2. Available from: git://github.com/afaerber/qemu-cpu.git qom-cpu-ppc-types.v1 https://github.com/afaerber/qemu-cpu/commits/qom-cpu-ppc-types.v1 Thanks, Andreas Cc: Alexander Graf <ag...@suse.de> Cc: qemu-ppc <qemu-...@nongnu.org> Cc: David Gibson <da...@gibson.dropbear.id.au> Andreas Färber (39): target-ppc: Inline comma into POWERPC_DEF_SVR() macro target-ppc: Extract aliases from definitions list target-ppc: Make -cpu "ppc" an alias to "ppc32" target-ppc: Extract MPC5xx aliases target-ppc: Extract MGT823/MPC8xx as aliases target-ppc: Extract 40x aliases target-ppc: Extract 440 aliases target-ppc: Turn "ppc32" and "ppc64" CPUs into aliases target-ppc: Extract 74x7[A] aliases target-ppc: Extract 74x5 as aliases target-ppc: Extract 74x1 aliases target-ppc: Extract 7450 alias target-ppc: Extract 7448 alias target-ppc: Extract 7410 alias target-ppc: Extract 7400 alias target-ppc: Extract 7x5 aliases target-ppc: Extract 750 aliases target-ppc: Extract 740/750 aliases target-ppc: Extract 604e alias target-ppc: Extract 603e alias target-ppc: Extract 603r alias target-ppc: Extract 601/601v aliases target-ppc: Extract MPC85xx aliases target-ppc: Extract e500v1/e500v2 aliases target-ppc: Extract MPC83xx aliases target-ppc: Extract e300 alias target-ppc: Extract e200 alias target-ppc: Extract MPC82xx alias target-ppc: Extract MPC8247/MPC8248/MPC8270-80 aliases target-ppc: Extract MPC82xx aliases to *_HiP4 target-ppc: Extract MPC82xx_HiP{3,4} aliases target-ppc: Extract MPC52xx alias target-ppc: Extract MPC5200/MPC5200B aliases target-ppc: Extract MPC8240 alias target-ppc: Extract 405GPe alias target-ppc: Extract 970 aliases target-ppc: Extract POWER7 alias target-ppc: Get model name from type name target-ppc: Convert CPU definitions target-ppc/cpu-qom.h | 17 +- target-ppc/cpu.h | 20 - target-ppc/translate_init.c | 1960 ++++++++++++++++++------------------------- 3 Dateien geändert, 850 Zeilen hinzugefügt(+), 1147 Zeilen entfernt(-) -- 1.7.10.4
