From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41238)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WIbgO-0002cH-8g
	for qemu-devel@nongnu.org; Wed, 26 Feb 2014 05:25:50 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WIbgI-00022Q-AU
	for qemu-devel@nongnu.org; Wed, 26 Feb 2014 05:25:44 -0500
Received: from mx1.redhat.com ([209.132.183.28]:17240)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1WIbgH-00022G-Pw
	for qemu-devel@nongnu.org; Wed, 26 Feb 2014 05:25:37 -0500
Message-ID: <530DC119.3010802@redhat.com>
Date: Wed, 26 Feb 2014 11:25:29 +0100
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1393394204-16632-1-git-send-email-famz@redhat.com>
In-Reply-To: <1393394204-16632-1-git-send-email-famz@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] modules: Fix building with --enable-modules
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>, qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>

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 <famz@redhat.com>
> ---
>  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"
>
>