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

