From 4990431dfab2f2573ec4ddd97cf656a674ca9d07 Mon Sep 17 00:00:00 2001 From: Vladimir Chtchetkine Date: Tue, 27 Sep 2011 12:51:05 -0700 Subject: Merge from 491e6d on master. Do not merge. Use different macro for KVM Change-Id: I6d53aac7de92d8991f7cf0cf34484a0083f642a5 --- hw/goldfish_pipe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/goldfish_pipe.c b/hw/goldfish_pipe.c index 5a00247..b3c6975 100644 --- a/hw/goldfish_pipe.c +++ b/hw/goldfish_pipe.c @@ -14,7 +14,7 @@ #include "hw/goldfish_pipe.h" #include "hw/goldfish_device.h" #include "qemu-timer.h" -#ifdef TARGET_I386 +#ifdef CONFIG_KVM #include "kvm.h" #endif @@ -879,7 +879,7 @@ pipeDevice_doCommand( PipeDevice* dev, uint32_t command ) uint32_t address = dev->address; uint32_t page = address & TARGET_PAGE_MASK; target_phys_addr_t phys; -#ifdef TARGET_I386 +#ifdef CONFIG_KVM if(kvm_enabled()) { cpu_synchronize_state(env, 0); } @@ -899,7 +899,7 @@ pipeDevice_doCommand( PipeDevice* dev, uint32_t command ) uint32_t address = dev->address; uint32_t page = address & TARGET_PAGE_MASK; target_phys_addr_t phys; -#ifdef TARGET_I386 +#ifdef CONFIG_KVM if(kvm_enabled()) { cpu_synchronize_state(env, 0); } -- cgit v1.1