From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:56342)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1UcXEe-00039v-2B
	for qemu-devel@nongnu.org; Wed, 15 May 2013 04:39:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1UcXEb-0001oW-PG
	for qemu-devel@nongnu.org; Wed, 15 May 2013 04:38:55 -0400
Received: from mail-ye0-f178.google.com ([209.85.213.178]:56924)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1UcXEb-0001oJ-Kw
	for qemu-devel@nongnu.org; Wed, 15 May 2013 04:38:53 -0400
Received: by mail-ye0-f178.google.com with SMTP id q8so303467yen.23
	for <qemu-devel@nongnu.org>; Wed, 15 May 2013 01:38:53 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
Message-ID: <51934995.4010000@redhat.com>
Date: Wed, 15 May 2013 10:38:45 +0200
From: Paolo Bonzini <pbonzini@redhat.com>
MIME-Version: 1.0
References: <1368590499-11707-1-git-send-email-lig.fnst@cn.fujitsu.com>
	<1368590499-11707-2-git-send-email-lig.fnst@cn.fujitsu.com>
In-Reply-To: <1368590499-11707-2-git-send-email-lig.fnst@cn.fujitsu.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 2/2] pc: reject do pc_acpi_init if
	acpi_enabled is false
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: liguang <lig.fnst@cn.fujitsu.com>
Cc: Anthony Liguori <aliguori@us.ibm.com>, Bruce Rogers <brogers@suse.com>, Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org, mst@redhat.com

Il 15/05/2013 06:01, liguang ha scritto:
> Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>

--verbose, please.

What problem does this patch fix?

Paolo

> ---
>  hw/i386/pc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 197d218..77025a8 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -982,7 +982,7 @@ void pc_acpi_init(const char *default_dsdt)
>  {
>      char *filename;
>  
> -    if (acpi_tables != NULL) {
> +    if (acpi_tables != NULL || !acpi_enabled) {
>          /* manually set via -acpitable, leave it alone */
>          return;
>      }
>