From patchwork Wed Feb 24 14:17:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 46126 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3E85BB7B98 for ; Thu, 25 Feb 2010 01:49:57 +1100 (EST) Received: from localhost ([127.0.0.1]:51545 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkIYk-0003he-DE for incoming@patchwork.ozlabs.org; Wed, 24 Feb 2010 09:49:54 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NkIX8-0003AB-Sx for qemu-devel@nongnu.org; Wed, 24 Feb 2010 09:48:14 -0500 Received: from [199.232.76.173] (port=53203 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NkIX8-00039W-8Y for qemu-devel@nongnu.org; Wed, 24 Feb 2010 09:48:14 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NkIX6-0000U8-4g for qemu-devel@nongnu.org; Wed, 24 Feb 2010 09:48:14 -0500 Received: from mx20.gnu.org ([199.232.41.8]:2120) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NkIX5-0008Bq-Pw for qemu-devel@nongnu.org; Wed, 24 Feb 2010 09:48:11 -0500 Received: from david.siemens.de ([192.35.17.14]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NkI6p-0003fq-6q for qemu-devel@nongnu.org; Wed, 24 Feb 2010 09:21:03 -0500 Received: from mail2.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o1OEHw7U030402; Wed, 24 Feb 2010 15:17:58 +0100 Received: from localhost.localdomain (mchn012c.ww002.siemens.net [139.25.109.167] (may be forged)) by mail2.siemens.de (8.12.11.20060308/8.12.11) with ESMTP id o1OEHvk7006898; Wed, 24 Feb 2010 15:17:58 +0100 From: Jan Kiszka To: Avi Kivity , Marcelo Tosatti Date: Wed, 24 Feb 2010 15:17:56 +0100 Message-Id: <389b1e159013e92f49134b057eb63d7b678636fd.1267021065.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.4-2.6 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Gleb Natapov , qemu-devel@nongnu.org, kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v3 08/10] qemu-kvm: Clean up KVM's APIC hooks X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The APIC is part of the VCPU state, so trigger its readout and writeback from kvm_arch_save/load_regs. Thanks to the transparent sync on reset and vmsave/load, we can also drop explicit sync code, reducing the diff to upstream. Signed-off-by: Jan Kiszka --- hw/apic.c | 37 +++++-------------------------------- qemu-kvm-x86.c | 4 ++-- qemu-kvm.h | 5 ++--- 3 files changed, 9 insertions(+), 37 deletions(-) diff --git a/hw/apic.c b/hw/apic.c index 092c61e..d8c4f7c 100644 --- a/hw/apic.c +++ b/hw/apic.c @@ -24,8 +24,6 @@ #include "host-utils.h" #include "kvm.h" -#include "qemu-kvm.h" - //#define DEBUG_APIC /* APIC Local Vector Table */ @@ -951,36 +949,22 @@ static void kvm_kernel_lapic_load_from_user(APICState *s) #endif -void qemu_kvm_load_lapic(CPUState *env) +void kvm_load_lapic(CPUState *env) { #ifdef KVM_CAP_IRQCHIP - if (kvm_enabled() && kvm_vcpu_inited(env) && kvm_irqchip_in_kernel()) { - kvm_kernel_lapic_load_from_user(env->apic_state); - } -#endif -} - -static void apic_pre_save(void *opaque) -{ -#ifdef KVM_CAP_IRQCHIP - APICState *s = (void *)opaque; - if (kvm_enabled() && kvm_irqchip_in_kernel()) { - kvm_kernel_lapic_save_to_user(s); + kvm_kernel_lapic_load_from_user(env->apic_state); } #endif } -static int apic_post_load(void *opaque, int version_id) +void kvm_save_lapic(CPUState *env) { #ifdef KVM_CAP_IRQCHIP - APICState *s = opaque; - if (kvm_enabled() && kvm_irqchip_in_kernel()) { - kvm_kernel_lapic_load_from_user(s); + kvm_kernel_lapic_save_to_user(env->apic_state); } #endif - return 0; } /* This function is only used for old state version 1 and 2 */ @@ -1019,9 +1003,6 @@ static int apic_load_old(QEMUFile *f, void *opaque, int version_id) if (version_id >= 2) qemu_get_timer(f, s->timer); - - qemu_kvm_load_lapic(s->cpu_env); - return 0; } @@ -1052,9 +1033,7 @@ static const VMStateDescription vmstate_apic = { VMSTATE_INT64(next_time, APICState), VMSTATE_TIMER(timer, APICState), VMSTATE_END_OF_LIST() - }, - .pre_save = apic_pre_save, - .post_load = apic_post_load, + } }; static void apic_reset(void *opaque) @@ -1077,7 +1056,6 @@ static void apic_reset(void *opaque) */ s->lvt[APIC_LVT_LINT0] = 0x700; } - qemu_kvm_load_lapic(s->cpu_env); } static CPUReadMemoryFunc * const apic_mem_read[3] = { @@ -1121,11 +1099,6 @@ int apic_init(CPUState *env) vmstate_register(s->idx, &vmstate_apic, s); qemu_register_reset(apic_reset, s); - /* apic_reset must be called before the vcpu threads are initialized and load - * registers, in qemu-kvm. - */ - apic_reset(s); - local_apics[s->idx] = s; return 0; } diff --git a/qemu-kvm-x86.c b/qemu-kvm-x86.c index 84fd7fa..1ac5dbf 100644 --- a/qemu-kvm-x86.c +++ b/qemu-kvm-x86.c @@ -977,6 +977,7 @@ void kvm_arch_load_regs(CPUState *env, int level) if (level >= KVM_PUT_RESET_STATE) { kvm_arch_load_mpstate(env); + kvm_load_lapic(env); } if (kvm_irqchip_in_kernel()) { /* Avoid deadlock: no user space IRQ will ever clear it. */ @@ -1146,6 +1147,7 @@ void kvm_arch_save_regs(CPUState *env) } } kvm_arch_save_mpstate(env); + kvm_save_lapic(env); kvm_get_vcpu_events(env); } @@ -1216,8 +1218,6 @@ int kvm_arch_init_vcpu(CPUState *cenv) CPUState copy; uint32_t i, j, limit; - qemu_kvm_load_lapic(cenv); - kvm_arch_reset_vcpu(cenv); #ifdef KVM_CPUID_SIGNATURE diff --git a/qemu-kvm.h b/qemu-kvm.h index 827cac5..0965152 100644 --- a/qemu-kvm.h +++ b/qemu-kvm.h @@ -864,9 +864,8 @@ static inline void kvm_inject_x86_mce(CPUState *cenv, int bank, int kvm_main_loop(void); int kvm_init_ap(void); int kvm_vcpu_inited(CPUState *env); -void kvm_apic_init(CPUState *env); -/* called from vcpu initialization */ -void qemu_kvm_load_lapic(CPUState *env); +void kvm_save_lapic(CPUState *env); +void kvm_load_lapic(CPUState *env); void kvm_hpet_enable_kpit(void); void kvm_hpet_disable_kpit(void);