From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=53937 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OvEqW-00015Y-QJ
	for qemu-devel@nongnu.org; Mon, 13 Sep 2010 15:37:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gleb@redhat.com>) id 1OvEqV-00016X-MK
	for qemu-devel@nongnu.org; Mon, 13 Sep 2010 15:37:44 -0400
Received: from mx1.redhat.com ([209.132.183.28]:30074)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gleb@redhat.com>) id 1OvEqV-00016O-FF
	for qemu-devel@nongnu.org; Mon, 13 Sep 2010 15:37:43 -0400
Received: from int-mx08.intmail.prod.int.phx2.redhat.com
	(int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o8DJbfqq021174
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Mon, 13 Sep 2010 15:37:41 -0400
Date: Mon, 13 Sep 2010 21:37:40 +0200
From: Gleb Natapov <gleb@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] hpet: check no_hpet when adding fw_cfg entry.
Message-ID: <20100913193740.GD13951@redhat.com>
References: <1283774484-11575-1-git-send-email-kraxel@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1283774484-11575-1-git-send-email-kraxel@redhat.com>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>
Cc: qemu-devel@nongnu.org

On Mon, Sep 06, 2010 at 02:01:24PM +0200, Gerd Hoffmann wrote:
> We should only pass the hpet config entry in case we actually
> create a hpet device.
> 
No we should pass it always. If no hpets are present hpet_cfg will have
appropriate info.


> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
> ---
>  hw/pc.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/pc.c b/hw/pc.c
> index 0c31db1..c96f1fc 100644
> --- a/hw/pc.c
> +++ b/hw/pc.c
> @@ -517,8 +517,10 @@ static void *bochs_bios_init(void)
>      fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, (uint8_t *)&e820_table,
>                       sizeof(struct e820_table));
>  
> -    fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, (uint8_t *)&hpet_cfg,
> -                     sizeof(struct hpet_fw_config));
> +    if (!no_hpet) {
> +        fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, (uint8_t *)&hpet_cfg,
> +                         sizeof(struct hpet_fw_config));
> +    }
>      /* allocate memory for the NUMA channel: one (64bit) word for the number
>       * of nodes, one word for each VCPU->node and one word for each node to
>       * hold the amount of memory.
> -- 
> 1.7.1
> 

--
			Gleb.