motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-23 18:12:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

TARGET_I386 is always defined if TARGET_X86_64 is defined

Browse source 
Patchworks-ID: 35378
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-10-08 00:00:00 +02:00 • committed by Anthony Liguori
parent a3a766e7b3
commit ce88f890bd
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/hpet_emul.h
View file

@ -74,7 +74,7 @@ typedef struct HPETState {
uint64_t hpet_counter; /* main counter */ uint64_t hpet_counter; /* main counter */
} HPETState; } HPETState;
#if defined TARGET_I386 || defined TARGET_X86_64 #if defined TARGET_I386
extern uint32_t hpet_in_legacy_mode(void); extern uint32_t hpet_in_legacy_mode(void);
extern void hpet_init(qemu_irq *irq); extern void hpet_init(qemu_irq *irq);
#endif #endif

4
hw/mc146818rtc.c
View file

@ -91,7 +91,7 @@ static void rtc_irq_raise(qemu_irq irq) {
* mode is established while interrupt is raised. We want it to * mode is established while interrupt is raised. We want it to
* be lowered in any case * be lowered in any case
*/ */
#if defined TARGET_I386 || defined TARGET_X86_64 #if defined TARGET_I386
if (!hpet_in_legacy_mode()) if (!hpet_in_legacy_mode())
#endif #endif
qemu_irq_raise(irq); qemu_irq_raise(irq);
@ -138,7 +138,7 @@ static void rtc_timer_update(RTCState *s, int64_t current_time)
int enable_pie; int enable_pie;
period_code = s->cmos_data[RTC_REG_A] & 0x0f; 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 /* disable periodic timer if hpet is in legacy mode, since interrupts are
* disabled anyway. * disabled anyway.
*/ */

2
hw/pci-hotplug.c
View file

@ -34,7 +34,7 @@
#include "virtio-blk.h" #include "virtio-blk.h"
#include "qemu-config.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, static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
const char *devaddr, const char *devaddr,
const char *opts_str) const char *opts_str)