* [PATCH] KVM: Qemu: fix compilation error in IA64
@ 2009-04-02 1:58 ` Zhang, Yang
0 siblings, 0 replies; 5+ messages in thread
From: Zhang, Yang @ 2009-04-02 1:58 UTC (permalink / raw)
To: kvm-ia64
[-- Attachment #1: Type: text/plain, Size: 714 bytes --]
fix compilation error in IA64
Signed-off-by: Yang Zhang <Yang Zhang>
---
kernel/ia64/external-module-compat.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kernel/ia64/external-module-compat.h b/kernel/ia64/external-module-compat.h
index 592733c..bc78c3d 100644
--- a/kernel/ia64/external-module-compat.h
+++ b/kernel/ia64/external-module-compat.h
@@ -42,6 +42,12 @@ typedef u64 phys_addr_t;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+
+#define PAGE_KERNEL_UC __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX | \
+ _PAGE_MA_UC)
+#endif
+
#endif
#ifndef CONFIG_HAVE_KVM_IRQCHIP
--
1.6.0.rc1
[-- Attachment #2: 0001-KVM-Qemu-fix-compilation-error-in-IA64.patch --]
[-- Type: application/octet-stream, Size: 886 bytes --]
From 0714123c279861b74a6ee5d3990a9af40dfb6b1c Mon Sep 17 00:00:00 2001
From: Yang Zhang <Yang Zhang>
Date: Wed, 1 Apr 2009 06:19:11 -0400
Subject: [PATCH] KVM: Qemu: fix compilation error in IA64
fix compilation error in IA64
Signed-off-by: Yang Zhang <Yang Zhang>
---
kernel/ia64/external-module-compat.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kernel/ia64/external-module-compat.h b/kernel/ia64/external-module-compat.h
index 592733c..bc78c3d 100644
--- a/kernel/ia64/external-module-compat.h
+++ b/kernel/ia64/external-module-compat.h
@@ -42,6 +42,12 @@ typedef u64 phys_addr_t;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+
+#define PAGE_KERNEL_UC __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX | \
+ _PAGE_MA_UC)
+#endif
+
#endif
#ifndef CONFIG_HAVE_KVM_IRQCHIP
--
1.6.0.rc1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] KVM: Qemu: fix compilation error in IA64
@ 2009-04-02 1:58 ` Zhang, Yang
0 siblings, 0 replies; 5+ messages in thread
From: Zhang, Yang @ 2009-04-02 1:58 UTC (permalink / raw)
To: kvm-ia64@vger.kernel.org; +Cc: kvm@vger.kernel.org, Avi Kivity, Zhang, Xiantao
[-- Attachment #1: Type: text/plain, Size: 714 bytes --]
fix compilation error in IA64
Signed-off-by: Yang Zhang <Yang Zhang>
---
kernel/ia64/external-module-compat.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kernel/ia64/external-module-compat.h b/kernel/ia64/external-module-compat.h
index 592733c..bc78c3d 100644
--- a/kernel/ia64/external-module-compat.h
+++ b/kernel/ia64/external-module-compat.h
@@ -42,6 +42,12 @@ typedef u64 phys_addr_t;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+
+#define PAGE_KERNEL_UC __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX | \
+ _PAGE_MA_UC)
+#endif
+
#endif
#ifndef CONFIG_HAVE_KVM_IRQCHIP
--
1.6.0.rc1
[-- Attachment #2: 0001-KVM-Qemu-fix-compilation-error-in-IA64.patch --]
[-- Type: application/octet-stream, Size: 886 bytes --]
From 0714123c279861b74a6ee5d3990a9af40dfb6b1c Mon Sep 17 00:00:00 2001
From: Yang Zhang <Yang Zhang>
Date: Wed, 1 Apr 2009 06:19:11 -0400
Subject: [PATCH] KVM: Qemu: fix compilation error in IA64
fix compilation error in IA64
Signed-off-by: Yang Zhang <Yang Zhang>
---
kernel/ia64/external-module-compat.h | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kernel/ia64/external-module-compat.h b/kernel/ia64/external-module-compat.h
index 592733c..bc78c3d 100644
--- a/kernel/ia64/external-module-compat.h
+++ b/kernel/ia64/external-module-compat.h
@@ -42,6 +42,12 @@ typedef u64 phys_addr_t;
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
+
+#define PAGE_KERNEL_UC __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX | \
+ _PAGE_MA_UC)
+#endif
+
#endif
#ifndef CONFIG_HAVE_KVM_IRQCHIP
--
1.6.0.rc1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] KVM: Qemu: fix compilation error in IA64
2009-04-02 1:58 ` Zhang, Yang
@ 2009-04-02 9:58 ` Avi Kivity
-1 siblings, 0 replies; 5+ messages in thread
From: Avi Kivity @ 2009-04-02 9:58 UTC (permalink / raw)
To: kvm-ia64
Zhang, Yang wrote:
> fix compilation error in IA64
>
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] KVM: Qemu: fix compilation error in IA64
@ 2009-04-02 9:58 ` Avi Kivity
0 siblings, 0 replies; 5+ messages in thread
From: Avi Kivity @ 2009-04-02 9:58 UTC (permalink / raw)
To: Zhang, Yang; +Cc: kvm-ia64@vger.kernel.org, kvm@vger.kernel.org, Zhang, Xiantao
Zhang, Yang wrote:
> fix compilation error in IA64
>
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] kvm: qemu: fix compilation error in ia64
2009-04-02 1:58 ` Zhang, Yang
(?)
(?)
@ 2009-05-12 8:23 ` Zhang, Yang
-1 siblings, 0 replies; 5+ messages in thread
From: Zhang, Yang @ 2009-05-12 8:23 UTC (permalink / raw)
To: kvm-ia64
[-- Attachment #1: Type: text/plain, Size: 1192 bytes --]
ia64 doesn't need the function kvm_arch_get_supported_cpuid.
Move it to qemu-kvm-x86.c from qemu-kvm.c
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Yang Zhang <yang.zhang@intel.com>
---
qemu-kvm-x86.c | 6 ++++++
qemu-kvm.c | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 8cb6faa..856b70c 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -887,3 +887,9 @@ int kvm_arch_init_irq_routing(void)
}
return 0;
}
+
+uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
+ int reg)
+{
+ return kvm_get_supported_cpuid(kvm_context, function, reg);
+}
diff --git a/qemu-kvm.c b/qemu-kvm.c
index f55cee8..d6d0253 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1425,9 +1425,3 @@ void qemu_kvm_cpu_stop(CPUState *env)
if (kvm_enabled())
env->kvm_cpu_state.stopped = 1;
}
-
-uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
- int reg)
-{
- return kvm_get_supported_cpuid(kvm_context, function, reg);
-}
--
1.6.0.rc1
[-- Attachment #2: 0001-kvm-qemu-fix-compilation-error-in-ia64.patch --]
[-- Type: application/octet-stream, Size: 1407 bytes --]
From 56cc33ed2056dd1cd3f41af3e99991ec54485a97 Mon Sep 17 00:00:00 2001
From: Yang Zhang <yang.zhang@intel.com>
Date: Mon, 11 May 2009 20:08:08 -0400
Subject: [PATCH] kvm: qemu: fix compilation error in ia64
ia64 doesn't need the function kvm_arch_get_supported_cpuid.
Move it to qemu-kvm-x86.c from qemu-kvm.c
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Yang Zhang <yang.zhang@intel.com>
---
qemu-kvm-x86.c | 6 ++++++
qemu-kvm.c | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c
index 8cb6faa..856b70c 100644
--- a/qemu-kvm-x86.c
+++ b/qemu-kvm-x86.c
@@ -887,3 +887,9 @@ int kvm_arch_init_irq_routing(void)
}
return 0;
}
+
+uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
+ int reg)
+{
+ return kvm_get_supported_cpuid(kvm_context, function, reg);
+}
diff --git a/qemu-kvm.c b/qemu-kvm.c
index f55cee8..d6d0253 100644
--- a/qemu-kvm.c
+++ b/qemu-kvm.c
@@ -1425,9 +1425,3 @@ void qemu_kvm_cpu_stop(CPUState *env)
if (kvm_enabled())
env->kvm_cpu_state.stopped = 1;
}
-
-uint32_t kvm_arch_get_supported_cpuid(CPUState *env, uint32_t function,
- int reg)
-{
- return kvm_get_supported_cpuid(kvm_context, function, reg);
-}
--
1.6.0.rc1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-05-12 8:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-02 1:58 [PATCH] KVM: Qemu: fix compilation error in IA64 Zhang, Yang
2009-04-02 1:58 ` Zhang, Yang
2009-04-02 9:58 ` Avi Kivity
2009-04-02 9:58 ` Avi Kivity
2009-05-12 8:23 ` [PATCH] kvm: qemu: fix compilation error in ia64 Zhang, Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.