[PATCH] kvm-userspace: fix kvm initialization

[PATCH] kvm-userspace: fix kvm initialization

[Ehrhardt Christian]

A recent patch in qemu and its merge removed the availability of
kvm_init_new_ap in target-$arch. The helper files now should call
kvm_init_vcpu() directly.
This patch changes that for powerpc.

This should be true for target-ia64/op_helper.c too.

Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
---

[diffstat]
 helper.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

[diff]

diff --git a/qemu/target-ppc/helper.c b/qemu/target-ppc/helper.c
--- a/qemu/target-ppc/helper.c
+++ b/qemu/target-ppc/helper.c
@@ -2959,10 +2959,8 @@
     env->cpu_model_str = cpu_model;
     cpu_ppc_register_internal(env, def);
     cpu_ppc_reset(env);
-#ifdef USE_KVM
     if (kvm_enabled())
-	kvm_init_new_ap(env->cpu_index, env);
-#endif
+	kvm_init_vcpu(env);
     return env;
 }
 

Re: [PATCH] kvm-userspace: fix kvm initialization

[Avi Kivity]

Ehrhardt Christian wrote:
> A recent patch in qemu and its merge removed the availability of
> kvm_init_new_ap in target-$arch. The helper files now should call
> kvm_init_vcpu() directly.
> This patch changes that for powerpc.
>
> This should be true for target-ia64/op_helper.c too.
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function

RE: [PATCH] kvm-userspace: fix kvm initialization

[Zhang, Xiantao]

[-- Attachment #1: Type: text/plain, Size: 937 bytes --]

Okay, attached the corresponding fix for ia64 arch. 
Xiantao

-----Original Message-----
From: kvm-owner@vger.kernel.org [mailto:kvm-owner@vger.kernel.org] On Behalf Of Avi Kivity
Sent: Monday, November 10, 2008 10:02 PM
To: Ehrhardt Christian
Cc: kvm@vger.kernel.org; hollisb@us.ibm.com
Subject: Re: [PATCH] kvm-userspace: fix kvm initialization

Ehrhardt Christian wrote:
> A recent patch in qemu and its merge removed the availability of
> kvm_init_new_ap in target-$arch. The helper files now should call
> kvm_init_vcpu() directly.
> This patch changes that for powerpc.
>
> This should be true for target-ia64/op_helper.c too.
>   

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[-- Attachment #2: 0001-KVM-Userspace-Use-new-interface-kvm_init_vcpu-for.patch --]
[-- Type: application/octet-stream, Size: 1306 bytes --]

From 7d88d2d056020a528442da0b1adf82d4f89cdce6 Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@intel.com>
Date: Mon, 10 Nov 2008 22:17:23 +0800
Subject: [PATCH] KVM: Userspace: Use new interface kvm_init_vcpu for vcpu's initilization.

Also define kvm_arch_do_ioperm for ia64 arch.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
---
 qemu/qemu-kvm-ia64.c         |    6 ++++++
 qemu/target-ia64/op_helper.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/qemu/qemu-kvm-ia64.c b/qemu/qemu-kvm-ia64.c
index 4b24564..7095d9a 100644
--- a/qemu/qemu-kvm-ia64.c
+++ b/qemu/qemu-kvm-ia64.c
@@ -106,3 +106,9 @@ void kvm_arch_cpu_reset(CPUState *env)
 	env->exception_index = EXCP_HLT;
     }
 }
+
+void kvm_arch_do_ioperm(void *_data)
+{
+    struct ioperm_data *data = _data;
+    ioperm(data->start_port, data->num, data->turn_on);
+}
diff --git a/qemu/target-ia64/op_helper.c b/qemu/target-ia64/op_helper.c
index b5897f7..78b32f9 100644
--- a/qemu/target-ia64/op_helper.c
+++ b/qemu/target-ia64/op_helper.c
@@ -37,7 +37,7 @@ CPUState *cpu_ia64_init(const char *cpu_model)
     cpu_reset(env);
     if (kvm_enabled()) {
         kvm_qemu_init_env(env);
-        kvm_init_new_ap(env->cpu_index, env);
+        kvm_init_vcpu(env);
     }
     return env;
 }
-- 
1.6.0

Re: [PATCH] kvm-userspace: fix kvm initialization

[Avi Kivity]

Zhang, Xiantao wrote:
> Okay, attached the corresponding fix for ia64 arch. 
>   

Applied that too, thanks.

-- 
error compiling committee.c: too many arguments to function