Am 18.12.2012 18:42, schrieb Eduardo Habkost: > On Tue, Dec 18, 2012 at 08:53:40AM +0100, Andreas Färber wrote: >> diff --git a/include/qemu/cpu.h b/include/qemu/cpu.h >> index 61b7698..5fbb3f9 100644 >> --- a/include/qemu/cpu.h >> +++ b/include/qemu/cpu.h >> @@ -21,6 +21,7 @@ >> #define QEMU_CPU_H >> >> #include "qemu/object.h" >> +#include "qemu-common.h" >> #include "qemu-thread.h" > > Please, don't add more "#include qemu-common.h" lines to header files. > This introduces yet another circular dependency: > > qemu-common.h -> target-*/cpu.h -> target-*/cpu-qom.h -> qemu/cpu.h -> > qemu-common.h
That's what 2/4 resolves. My reasoning was that this should be an uncontroversial code-sharing change since, for good or bad, qemu-common.h happens to be the place where this is defined today. Whether to move it to qemu-types.h as proposed or to a new qemu-stdio.h affects more than just the core CPU and thus me as maintainer and requires careful mingw32 etc. testing. > You could just reverse the order of patches 1/4 and 2/4, and include > "qemu-types.h" instead. If we find an agreeable solution by tomorrow for how/where to do it, sure! Andreas > The rest of the patch is an obvious removal of duplicate code, that > would get a Reviewed-By line from me. -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg