From 9d684b500e1a2d1c9d2294a6fc06a231df273980 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Tue, 27 Nov 2007 14:51:44 +0800 Subject: [PATCH] Fix compile error in non-x86 arch This patch disable PIC/IOAPIC live migration support for non-x86 arch. Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity --- hw/apic.c | 4 ++-- hw/i8259.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/apic.c b/hw/apic.c index 60d31fabbc..55ec7f1289 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -1132,7 +1132,7 @@ static void ioapic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t va #ifdef USE_KVM static void kvm_kernel_ioapic_save_to_user(IOAPICState *s) { -#ifdef KVM_CAP_IRQCHIP +#if defined(KVM_CAP_IRQCHIP) && defined(TARGET_I386) struct kvm_irqchip chip; struct kvm_ioapic_state *kioapic; int i; @@ -1151,7 +1151,7 @@ static void kvm_kernel_ioapic_save_to_user(IOAPICState *s) static void kvm_kernel_ioapic_load_from_user(IOAPICState *s) { -#ifdef KVM_CAP_IRQCHIP +#if defined(KVM_CAP_IRQCHIP) && defined(TARGET_I386) struct kvm_irqchip chip; struct kvm_ioapic_state *kioapic; int i; diff --git a/hw/i8259.c b/hw/i8259.c index 60063d41db..1bb81371f8 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -478,7 +478,7 @@ extern kvm_context_t kvm_context; static void kvm_kernel_pic_save_to_user(PicState *s) { -#ifdef KVM_CAP_IRQCHIP +#if defined(KVM_CAP_IRQCHIP) && defined(TARGET_I386) struct kvm_irqchip chip; struct kvm_pic_state *kpic; @@ -509,7 +509,7 @@ static void kvm_kernel_pic_save_to_user(PicState *s) static void kvm_kernel_pic_load_from_user(PicState *s) { -#ifdef KVM_CAP_IRQCHIP +#if defined(KVM_CAP_IRQCHIP) && defined(TARGET_I386) struct kvm_irqchip chip; struct kvm_pic_state *kpic; -- 2.11.4.GIT