From 5a3ca0556bb3f8b9e18d392535312c370c2dd2f7 Mon Sep 17 00:00:00 2001
From: Sheng Yang <[EMAIL PROTECTED]>
Date: Tue, 27 Nov 2007 14:51:44 +0800
Subject: [PATCH] kvm: qemu: Fix compile error in non-x86 arch
This patch disable PIC/IOAPIC live migration support for non-x86 arch.
Signed-off-by: Sheng Yang <[EMAIL PROTECTED]>
---
qemu/hw/apic.c | 4 ++--
qemu/hw/i8259.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/qemu/hw/apic.c b/qemu/hw/apic.c
index 60d31fa..55ec7f1 100644
--- a/qemu/hw/apic.c
+++ b/qemu/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/qemu/hw/i8259.c b/qemu/hw/i8259.c
index 60063d4..1bb8137 100644
--- a/qemu/hw/i8259.c
+++ b/qemu/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;
--
1.5.3.4
From 5a3ca0556bb3f8b9e18d392535312c370c2dd2f7 Mon Sep 17 00:00:00 2001
From: Sheng Yang <[EMAIL PROTECTED]>
Date: Tue, 27 Nov 2007 14:51:44 +0800
Subject: [PATCH] kvm: qemu: Fix compile error in non-x86 arch
This patch disable PIC/IOAPIC live migration support for non-x86 arch.
Signed-off-by: Sheng Yang <[EMAIL PROTECTED]>
---
qemu/hw/apic.c | 4 ++--
qemu/hw/i8259.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/qemu/hw/apic.c b/qemu/hw/apic.c
index 60d31fa..55ec7f1 100644
--- a/qemu/hw/apic.c
+++ b/qemu/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/qemu/hw/i8259.c b/qemu/hw/i8259.c
index 60063d4..1bb8137 100644
--- a/qemu/hw/i8259.c
+++ b/qemu/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;
--
1.5.3.4
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
