From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=48223 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OsaOA-0004i5-9P for qemu-devel@nongnu.org; Mon, 06 Sep 2010 08:01:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OsaO8-00061v-VT for qemu-devel@nongnu.org; Mon, 06 Sep 2010 08:01:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33104) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OsaO8-00061g-Nj for qemu-devel@nongnu.org; Mon, 06 Sep 2010 08:01:28 -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 o86C1Rki016122 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 6 Sep 2010 08:01:27 -0400 From: Gerd Hoffmann Date: Mon, 6 Sep 2010 14:01:24 +0200 Message-Id: <1283774484-11575-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH] hpet: check no_hpet when adding fw_cfg entry. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann We should only pass the hpet config entry in case we actually create a hpet device. Signed-off-by: Gerd Hoffmann --- 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