aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-10-08 00:00:00 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-10-12 09:42:31 -0500
commitce88f890bdbb4e38a047d9e5d096233163452651 (patch)
tree2d3df28f6cb23efeb3e300e27b7f3a437060c7a3
parenta3a766e7b3878e598dee5e4d426c067d5db051d3 (diff)
downloadqemu-ce88f890bdbb4e38a047d9e5d096233163452651.zip
qemu-ce88f890bdbb4e38a047d9e5d096233163452651.tar.gz
qemu-ce88f890bdbb4e38a047d9e5d096233163452651.tar.bz2
TARGET_I386 is always defined if TARGET_X86_64 is defined
Patchworks-ID: 35378 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--hw/hpet_emul.h2
-rw-r--r--hw/mc146818rtc.c4
-rw-r--r--hw/pci-hotplug.c2
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 d82131a..e6e6cbf 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 ccd2cf3..08b5826 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)