modules: Fix building with --enable-modules
PATCH 1/1 modules: Fix building with --enable-modules
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.
--- scripts/create_config | 3 +++ util/module.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)
scripts/create_config +3 -0
@@ -30,6 +30,9 @@ case $line in value=${line#*=} echo "#define CONFIG_IASL $value" ;; + CONFIG_MODULES=y) + echo "#define CONFIG_MODULES 1" + ;; CONFIG_AUDIO_DRIVERS=*) drivers=${line#*=} echo "#define CONFIG_AUDIO_DRIVERS \\"
util/module.c +1 -1
@@ -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"
Signature · 1 line
1.9.0
Quoted 33 lines · Fam Zheng
Compiling
util/modules.cwith modules enabled fails now.Fix it by:
1) Add "#define
CONFIG_MODULES" with --enable-modules2) Include
qemu-common.hbefore #ifdef testing inmodule.c.Signed-off-by Fam Zheng <[email protected]>--- scripts/create_config | 3 +++ util/module.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)scripts/create_config +3
-0@@ -30,6 +30,9 @@ case $line in value=${line#*=} echo "#define CONFIG_IASL $value" ;; + CONFIG_MODULES=y) + echo "#define CONFIG_MODULES 1" + ;; CONFIG_AUDIO_DRIVERS=*) drivers=${line#*=} echo "#define CONFIG_AUDIO_DRIVERS \\"util/module.c +0
-0
util/module.c line 17
Quoted 4 lines
util/module.c +1
-0@@ -14,10 +14,10 @@*/ #include <stdlib.h> +#include "qemu-common.h"
So it's moved up here for CONFIG_MODULES. BTW, the stdlib.h line can be removed since qemu-common.h includes it already.
Reviewed&tested-by: Hu Tao <[email protected]>
Quoted 10 lines
util/module.c +0
-1#ifdef CONFIG_MODULES #include <gmodule.h> #endif -#include "qemu-common.h" #include "qemu/queue.h" #include "qemu/module.h" Signature · 1 line
1.9.0
Il 26/02/2014 06:56, Fam Zheng ha scritto:
Quoted 19 lines
Compiling
util/modules.cwith modules enabled fails now.Fix it by:
1) Add "#define
CONFIG_MODULES" with --enable-modules2) Include
qemu-common.hbefore #ifdef testing inmodule.c.Signed-off-by Fam Zheng <[email protected]>--- scripts/create_config | 3 +++ util/module.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)scripts/create_config +0
-0
scripts/create_config case $line in · line 35
Quoted 6 lines
scripts/create_config +3
-0@@ -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
Quoted 20 lines
scripts/create_config +0
-0CONFIG_AUDIO_DRIVERS=*) drivers=${line#*=} echo "#define CONFIG_AUDIO_DRIVERS \\"util/module.c +1
-1@@ -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"