From patchwork Mon May 24 15:18:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 53431 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6439BB7D1F for ; Tue, 25 May 2010 01:30:05 +1000 (EST) Received: from localhost ([127.0.0.1]:45825 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGZZP-0003Gh-Bs for incoming@patchwork.ozlabs.org; Mon, 24 May 2010 11:27:59 -0400 Received: from [140.186.70.92] (port=41624 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OGZQF-0005uN-V3 for qemu-devel@nongnu.org; Mon, 24 May 2010 11:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OGZQC-0008Vy-LU for qemu-devel@nongnu.org; Mon, 24 May 2010 11:18:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31231) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OGZQC-0008Vt-8O for qemu-devel@nongnu.org; Mon, 24 May 2010 11:18:28 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o4OFIRas014432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 24 May 2010 11:18:27 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o4OFIMLv009416; Mon, 24 May 2010 11:18:25 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 24 May 2010 17:18:17 +0200 Message-Id: <6ca8004ac4217d108d0f500c175dad3d0648e8cb.1274714215.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 2/6] Move no_hpet declaration to hpet_emul.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/hpet_emul.h | 2 ++ hw/pc.h | 3 --- monitor.c | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/hpet_emul.h b/hw/hpet_emul.h index cfd95b4..7e9b610 100644 --- a/hw/hpet_emul.h +++ b/hw/hpet_emul.h @@ -13,6 +13,8 @@ #ifndef QEMU_HPET_EMUL_H #define QEMU_HPET_EMUL_H +extern int no_hpet; + #define HPET_BASE 0xfed00000 #define HPET_CLK_PERIOD 10000000ULL /* 10000000 femtoseconds == 10ns*/ diff --git a/hw/pc.h b/hw/pc.h index 73cccef..5ee0aad 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -124,9 +124,6 @@ i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, int kvm_enabled); void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr); -/* hpet.c */ -extern int no_hpet; - /* pcspk.c */ void pcspk_init(PITState *); int pcspk_audio_init(qemu_irq *pic); diff --git a/monitor.c b/monitor.c index a1ebc5d..5975f40 100644 --- a/monitor.c +++ b/monitor.c @@ -30,6 +30,7 @@ #include "hw/pci.h" #include "hw/watchdog.h" #include "hw/loader.h" +#include "hw/hpet_emul.h" #include "gdbstub.h" #include "net.h" #include "net/slirp.h"