Am 02.05.2012 18:07, schrieb Eduardo Habkost: > Changes v2 -> v3: > - Rebase against latest qemu.git > > Changes v1 -> v2: > - Change 'userconfig' field/variables to bool instead of int > - Coding style change > > Signed-off-by: Eduardo Habkost <ehabkost@xxxxxxxxxx> > --- > arch_init.c | 11 ++++++++--- > qemu-config.h | 2 +- > qemu-options.hx | 16 +++++++++++++--- > vl.c | 6 +++++- > 4 files changed, 27 insertions(+), 8 deletions(-) > > diff --git a/arch_init.c b/arch_init.c > index 62332e9..996baba 100644 > --- a/arch_init.c > +++ b/arch_init.c > @@ -114,19 +114,24 @@ const uint32_t arch_type = QEMU_ARCH; > > static struct defconfig_file { > const char *filename; > + /* Indicates it is an user config file (disabled by -no-user-config) */ > + bool userconfig; > } default_config_files[] = { > - { CONFIG_QEMU_CONFDIR "/qemu.conf" }, > - { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf" }, > + { CONFIG_QEMU_CONFDIR "/qemu.conf", true }, > + { CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf", true }, > { NULL }, /* end of list */ > }; > > > -int qemu_read_default_config_files(void) > +int qemu_read_default_config_files(bool userconfig) These changes broke the build on Darwin/ppc(64). Just before this block there's an inclusion of altivec.h, which does #define bool __bool for powerpc-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5493). CC i386-softmmu/arch_init.o /Users/andreas/QEMU/qemu/arch_init.c:120: error: incompatible types in initialization /Users/andreas/QEMU/qemu/arch_init.c:121: error: incompatible types in initialization /Users/andreas/QEMU/qemu/arch_init.c:122: error: incompatible types in initialization /Users/andreas/QEMU/qemu/arch_init.c:128: error: conflicting types for 'qemu_read_default_config_files' /Users/andreas/QEMU/qemu/qemu-config.h:21: error: previous declaration of 'qemu_read_default_config_files' was here /Users/andreas/QEMU/qemu/arch_init.c: In function 'qemu_read_default_config_files': /Users/andreas/QEMU/qemu/arch_init.c:133: error: wrong type argument to unary exclamation mark /Users/andreas/QEMU/qemu/arch_init.c:133: error: invalid operands to binary && (have 'int' and '__vector __bool int') make[1]: *** [arch_init.o] Error 1 make: *** [subdir-i386-softmmu] Error 2 Any suggestion how to fix? Andreas -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list