From patchwork Wed Oct 7 22:00:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 35378 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 84B2BB7082 for ; Thu, 8 Oct 2009 09:01:09 +1100 (EST) Received: from localhost ([127.0.0.1]:57013 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MveZF-0004j8-V9 for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2009 18:01:06 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MveYb-0004g8-OS for qemu-devel@nongnu.org; Wed, 07 Oct 2009 18:00:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MveYX-0004ZY-TU for qemu-devel@nongnu.org; Wed, 07 Oct 2009 18:00:25 -0400 Received: from [199.232.76.173] (port=34519 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MveYX-0004Yu-JS for qemu-devel@nongnu.org; Wed, 07 Oct 2009 18:00:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53814) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MveYW-0005gI-UI for qemu-devel@nongnu.org; Wed, 07 Oct 2009 18:00:21 -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 n97M0KlN021391 for ; Wed, 7 Oct 2009 18:00:20 -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 n97M0INJ014114; Wed, 7 Oct 2009 18:00:19 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 8 Oct 2009 00:00:00 +0200 Message-Id: <1254952800-22244-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH] TARGET_I386 is always defined if TARGET_X86_64 is defined 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/mc146818rtc.c | 4 ++-- hw/pci-hotplug.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/hpet_emul.h b/hw/hpet_emul.h index 3258d8b..cfd95b4 100644 --- a/hw/hpet_emul.h +++ b/hw/hpet_emul.h @@ -74,7 +74,7 @@ typedef struct HPETState { uint64_t hpet_counter; /* main counter */ } HPETState; -#if defined TARGET_I386 || defined TARGET_X86_64 +#if defined TARGET_I386 extern uint32_t hpet_in_legacy_mode(void); extern void hpet_init(qemu_irq *irq); #endif diff --git a/hw/mc146818rtc.c b/hw/mc146818rtc.c index bec5687..0b945d5 100644 --- a/hw/mc146818rtc.c +++ b/hw/mc146818rtc.c @@ -91,7 +91,7 @@ static void rtc_irq_raise(qemu_irq irq) { * mode is established while interrupt is raised. We want it to * be lowered in any case */ -#if defined TARGET_I386 || defined TARGET_X86_64 +#if defined TARGET_I386 if (!hpet_in_legacy_mode()) #endif qemu_irq_raise(irq); @@ -138,7 +138,7 @@ static void rtc_timer_update(RTCState *s, int64_t current_time) int enable_pie; period_code = s->cmos_data[RTC_REG_A] & 0x0f; -#if defined TARGET_I386 || defined TARGET_X86_64 +#if defined TARGET_I386 /* disable periodic timer if hpet is in legacy mode, since interrupts are * disabled anyway. */ diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index c38a127..099a6f7 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -34,7 +34,7 @@ #include "virtio-blk.h" #include "qemu-config.h" -#if defined(TARGET_I386) || defined(TARGET_X86_64) +#if defined(TARGET_I386) static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, const char *devaddr, const char *opts_str)