Re: [Qemu-devel] [PATCH] modules: Fix building with --enable-modules

[Paolo Bonzini]

Il 26/02/2014 06:56, Fam Zheng ha scritto:
> Compiling util/modules.c with modules enabled fails now.
>
> Fix it by:
>
> 1) Add "#define CONFIG_MODULES" with --enable-modules
>
> 2) Include qemu-common.h before #ifdef testing in module.c.
>
> Signed-off-by: Fam Zheng <address@hidden>
> ---
>  scripts/create_config | 3 +++
>  util/module.c         | 2 +-
>  2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/create_config b/scripts/create_config
> index 546f889..a0654c6 100755
> --- a/scripts/create_config
> +++ b/scripts/create_config
> @@ -30,6 +30,9 @@ case $line in
>      value=${line#*=}
>      echo "#define CONFIG_IASL $value"
>      ;;
> + CONFIG_MODULES=y)
> +    echo "#define CONFIG_MODULES 1"
> +    ;;

Not needed:

 CONFIG_*=y) # configuration
    name=${line%=*}
    echo "#define $name 1"
    ;;

Paolo

>   CONFIG_AUDIO_DRIVERS=*)
>      drivers=${line#*=}
>      echo "#define CONFIG_AUDIO_DRIVERS \\"
> diff --git a/util/module.c b/util/module.c
> index dc08c16..863a8a3 100644
> --- a/util/module.c
> +++ b/util/module.c
> @@ -14,10 +14,10 @@
>   */
>
>  #include <stdlib.h>
> +#include "qemu-common.h"
>  #ifdef CONFIG_MODULES
>  #include <gmodule.h>
>  #endif
> -#include "qemu-common.h"
>  #include "qemu/queue.h"
>  #include "qemu/module.h"