[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH qemu 5/6] implement -no-user-config command-line
From: |
Andreas Färber |
Subject: |
Re: [Qemu-devel] [PATCH qemu 5/6] implement -no-user-config command-line option (v3) |
Date: |
Sun, 27 May 2012 16:02:29 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120421 Thunderbird/12.0 |
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 <address@hidden>
> ---
> 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
- [Qemu-devel] [PATCH qemu v3 0/6] -no-user-config option, move CPU models to /usr/share, Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 4/6] vl.c: change 'defconfig' variable to bool (v2), Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 3/6] move list of default config files to an array, Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 2/6] eliminate arch_config_name variable, Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 6/6] move CPU definitions to /usr/share/qemu/cpus-x86_64.conf (v2), Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 1/6] move code to read default config files to a separate function (v2), Eduardo Habkost, 2012/05/02
- [Qemu-devel] [PATCH qemu 5/6] implement -no-user-config command-line option (v3), Eduardo Habkost, 2012/05/02
- Re: [Qemu-devel] [PATCH qemu 5/6] implement -no-user-config command-line option (v3),
Andreas Färber <=
- Re: [Qemu-devel] [PATCH qemu v3 0/6] -no-user-config option, move CPU models to /usr/share, Eduardo Habkost, 2012/05/11
- Re: [Qemu-devel] [PATCH qemu v3 0/6] -no-user-config option, move CPU models to /usr/share, Anthony Liguori, 2012/05/14