From patchwork Wed Oct 7 22:00:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: TARGET_I386 is always defined if TARGET_X86_64 is defined Date: Wed, 07 Oct 2009 12:00:00 -0000 From: Juan Quintela X-Patchwork-Id: 35378 Message-Id: <1254952800-22244-1-git-send-email-quintela@redhat.com> To: qemu-devel@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)