From: Sheng Yang <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject: [PATCH] kvm: qemu: Fix compile error in non-x86 arch
Date: Tue, 27 Nov 2007 15:16:42 +0800 [thread overview]
Message-ID: <200711271516.42975.sheng.yang@intel.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2002 bytes --]
From 5a3ca0556bb3f8b9e18d392535312c370c2dd2f7 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
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 <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
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
[-- Attachment #2: 0001-kvm-qemu-Fix-compile-error-in-non-x86-arch.patch --]
[-- Type: text/x-diff, Size: 1998 bytes --]
From 5a3ca0556bb3f8b9e18d392535312c370c2dd2f7 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
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 <sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
---
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
[-- Attachment #3: Type: text/plain, Size: 228 bytes --]
-------------------------------------------------------------------------
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/
[-- Attachment #4: Type: text/plain, Size: 186 bytes --]
_______________________________________________
kvm-devel mailing list
kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/kvm-devel
next reply other threads:[~2007-11-27 7:16 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-27 7:16 Sheng Yang [this message]
[not found] ` <200711271516.42975.sheng.yang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
2007-11-27 8:39 ` [PATCH] kvm: qemu: Fix compile error in non-x86 arch Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200711271516.42975.sheng.yang@intel.com \
--to=sheng.yang-ral2jqcrhueavxtiumwx3w@public.gmane.org \
--cc=kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox