From patchwork Wed May 4 19:43:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 754722 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p44JijE3026530 for ; Wed, 4 May 2011 19:44:45 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755639Ab1EDTog (ORCPT ); Wed, 4 May 2011 15:44:36 -0400 Received: from fmmailgate01.web.de ([217.72.192.221]:38461 "EHLO fmmailgate01.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755576Ab1EDToS (ORCPT ); Wed, 4 May 2011 15:44:18 -0400 Received: from smtp04.web.de ( [172.20.0.225]) by fmmailgate01.web.de (Postfix) with ESMTP id 1BE5518E4DDFB; Wed, 4 May 2011 21:44:13 +0200 (CEST) Received: from [88.64.22.120] (helo=localhost.localdomain) by smtp04.web.de with asmtp (TLSv1:AES256-SHA:256) (WEB.DE 4.110 #2) id 1QHhzY-0006mo-03; Wed, 04 May 2011 21:44:13 +0200 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org Subject: [PATCH 05/19] qemu-kvm: Use upstream VCPU reset services Date: Wed, 4 May 2011 21:43:39 +0200 Message-Id: <28f123f372339a52e8bdcbce349f6429b04a717b.1304538230.git.jan.kiszka@web.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-Sender: jan.kiszka@web.de X-Provags-ID: V01U2FsdGVkX18wABlNrFfPPX1zDLpCS82zutqZcjuy9gbqjzQe WDFi7aOkFPKm92AmkZz6nzyXhPoNR+BXwizCnHE+I4iMvXnIYM qK1Epm2Tk= Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 04 May 2011 19:44:45 +0000 (UTC) From: Jan Kiszka Signed-off-by: Jan Kiszka --- kvm-all.c | 2 -- qemu-kvm-ia64.c | 2 +- qemu-kvm-x86.c | 5 ----- qemu-kvm.c | 7 ------- qemu-kvm.h | 1 - 5 files changed, 1 insertions(+), 16 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index 693bb4a..a871987 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -183,14 +183,12 @@ static int kvm_set_user_memory_region(KVMState *s, KVMSlot *slot) return kvm_vm_ioctl(s, KVM_SET_USER_MEMORY_REGION, &mem); } -#ifdef OBSOLETE_KVM_IMPL static void kvm_reset_vcpu(void *opaque) { CPUState *env = opaque; kvm_arch_reset_vcpu(env); } -#endif int kvm_irqchip_in_kernel(void) { diff --git a/qemu-kvm-ia64.c b/qemu-kvm-ia64.c index 39bcbeb..c3c7918 100644 --- a/qemu-kvm-ia64.c +++ b/qemu-kvm-ia64.c @@ -120,7 +120,7 @@ void kvm_arch_load_mpstate(CPUState *env) #endif } -void kvm_arch_cpu_reset(CPUState *env) +void kvm_arch_reset_vcpu(CPUState *env) { if (kvm_irqchip_in_kernel(kvm_context)) { #ifdef KVM_CAP_MP_STATE diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index eb8faf2..d180630 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -618,11 +618,6 @@ void kvm_arch_push_nmi(void *opaque) } #endif /* KVM_CAP_USER_NMI */ -void kvm_arch_cpu_reset(CPUState *env) -{ - kvm_arch_reset_vcpu(env); -} - #ifdef CONFIG_KVM_DEVICE_ASSIGNMENT void kvm_arch_do_ioperm(void *_data) { diff --git a/qemu-kvm.c b/qemu-kvm.c index b951146..ed72d1c 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -224,13 +224,6 @@ void kvm_disable_pit_creation(kvm_context_t kvm) kvm->no_pit_creation = 1; } -static void kvm_reset_vcpu(void *opaque) -{ - CPUState *env = opaque; - - kvm_arch_cpu_reset(env); -} - static void kvm_create_vcpu(CPUState *env, int id) { long mmap_size; diff --git a/qemu-kvm.h b/qemu-kvm.h index 6440d2c..79eb90d 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -663,7 +663,6 @@ int kvm_arch_has_work(CPUState *env); void kvm_arch_process_irqchip_events(CPUState *env); int kvm_arch_try_push_interrupts(void *opaque); void kvm_arch_push_nmi(void *opaque); -void kvm_arch_cpu_reset(CPUState *env); int kvm_set_boot_cpu_id(uint32_t id); void qemu_kvm_aio_wait_start(void);