From patchwork Thu Jan 10 15:29:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason J. Herne" X-Patchwork-Id: 211072 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D0A342C0345 for ; Fri, 11 Jan 2013 02:40:40 +1100 (EST) Received: from localhost ([::1]:49763 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtKFD-0002Sk-15 for incoming@patchwork.ozlabs.org; Thu, 10 Jan 2013 10:40:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtK4W-0006ix-Qd for qemu-devel@nongnu.org; Thu, 10 Jan 2013 10:29:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TtK4T-00088i-Bh for qemu-devel@nongnu.org; Thu, 10 Jan 2013 10:29:36 -0500 Received: from e38.co.us.ibm.com ([32.97.110.159]:39798) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TtK4T-00087x-5y for qemu-devel@nongnu.org; Thu, 10 Jan 2013 10:29:33 -0500 Received: from /spool/local by e38.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 10 Jan 2013 08:29:32 -0700 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e38.co.us.ibm.com (192.168.1.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 10 Jan 2013 08:29:31 -0700 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 9F5381FF0040 for ; Thu, 10 Jan 2013 08:29:18 -0700 (MST) Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r0AFTHsq043024 for ; Thu, 10 Jan 2013 08:29:17 -0700 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r0AFTGew012415 for ; Thu, 10 Jan 2013 08:29:16 -0700 Received: from w500-1204.endicott.ibm.com (w500-1204.endicott.ibm.com [9.60.75.168] (may be forged)) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r0AFTECl012100; Thu, 10 Jan 2013 08:29:14 -0700 From: "Jason J. Herne" To: agraf@suse.de, borntraeger@de.ibm.com, aliguori@us.ibm.com, mtosatti@redhat.com, qemu-devel@nongnu.org, R65777@freescale.com, jan.kiszka@siemens.com Date: Thu, 10 Jan 2013 10:29:13 -0500 Message-Id: <1357831753-3983-1-git-send-email-jjherne@us.ibm.com> X-Mailer: git-send-email 1.7.9.5 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13011015-5518-0000-0000-00000AA0111B X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.110.159 Cc: "Jason J. Herne" Subject: [Qemu-devel] [PATCH 5/7 v2] KVM regsync: Add register bitmap parameter to kvm_cpu_synchronize_state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Jason J. Herne" kvm_cpu_synchronize_state is updated to take/propagate the register bitmap parameter. All callers are modified to specify full state sync. Signed-off-by: Jason J. Herne Reviewed-by: Christian Borntraeger --- hw/spapr_rtas.c | 2 +- include/sysemu/kvm.h | 4 ++-- kvm-all.c | 4 ++-- kvm-stub.c | 2 +- target-i386/kvm.c | 10 +++++----- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hw/spapr_rtas.c b/hw/spapr_rtas.c index 81eecd0..3c7ffee 100644 --- a/hw/spapr_rtas.c +++ b/hw/spapr_rtas.c @@ -190,7 +190,7 @@ static void rtas_start_cpu(sPAPREnvironment *spapr, /* This will make sure qemu state is up to date with kvm, and * mark it dirty so our changes get flushed back before the * new cpu enters */ - kvm_cpu_synchronize_state(env); + kvm_cpu_synchronize_state(env, KVM_REGSYNC_FULL_STATE); env->msr = (1ULL << MSR_SF) | (1ULL << MSR_ME); env->nip = start; diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 193d1f4..9512c8b 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -229,7 +229,7 @@ struct kvm_cpu_syncstate_args { int regmap; }; -void kvm_cpu_synchronize_state(CPUArchState *env); +void kvm_cpu_synchronize_state(CPUArchState *env, int regmap); void kvm_cpu_synchronize_post_reset(CPUArchState *env); void kvm_cpu_synchronize_post_init(CPUArchState *env); @@ -238,7 +238,7 @@ void kvm_cpu_synchronize_post_init(CPUArchState *env); static inline void cpu_synchronize_state(CPUArchState *env) { if (kvm_enabled()) { - kvm_cpu_synchronize_state(env); + kvm_cpu_synchronize_state(env, KVM_REGSYNC_FULL_STATE); } } diff --git a/kvm-all.c b/kvm-all.c index 77ab72a..67ff696 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1502,13 +1502,13 @@ static void do_kvm_cpu_synchronize_state(void *arg) } } -void kvm_cpu_synchronize_state(CPUArchState *env) +void kvm_cpu_synchronize_state(CPUArchState *env, int regmap) { CPUState *cpu = ENV_GET_CPU(env); struct kvm_cpu_syncstate_args args; args.cpu = cpu; - args.regmap = KVM_REGSYNC_FULL_STATE; + args.regmap = regmap; if (args.regmap & ~cpu->kvm_vcpu_dirty) { run_on_cpu(cpu, do_kvm_cpu_synchronize_state, &args); diff --git a/kvm-stub.c b/kvm-stub.c index 5b97152..48018e1 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -38,7 +38,7 @@ void kvm_flush_coalesced_mmio_buffer(void) { } -void kvm_cpu_synchronize_state(CPUArchState *env) +void kvm_cpu_synchronize_state(CPUArchState *env, int regmap) { } diff --git a/target-i386/kvm.c b/target-i386/kvm.c index fc84922..c05ccc5 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1812,7 +1812,7 @@ int kvm_arch_process_async_events(CPUState *cs) env->interrupt_request &= ~CPU_INTERRUPT_MCE; - kvm_cpu_synchronize_state(env); + kvm_cpu_synchronize_state(env, KVM_REGSYNC_FULL_STATE); if (env->exception_injected == EXCP08_DBLE) { /* this means triple fault */ @@ -1843,16 +1843,16 @@ int kvm_arch_process_async_events(CPUState *cs) env->halted = 0; } if (env->interrupt_request & CPU_INTERRUPT_INIT) { - kvm_cpu_synchronize_state(env); + kvm_cpu_synchronize_state(env, KVM_REGSYNC_FULL_STATE); do_cpu_init(cpu); } if (env->interrupt_request & CPU_INTERRUPT_SIPI) { - kvm_cpu_synchronize_state(env); + kvm_cpu_synchronize_state(env, KVM_REGSYNC_FULL_STATE); do_cpu_sipi(cpu); } if (env->interrupt_request & CPU_INTERRUPT_TPR) { env->interrupt_request &= ~CPU_INTERRUPT_TPR; - kvm_cpu_synchronize_state(env); + kvm_cpu_synchronize_state(env, KVM_REGSYNC_FULL_STATE); apic_handle_tpr_access_report(env->apic_state, env->eip, env->tpr_access_type); } @@ -2138,7 +2138,7 @@ bool kvm_arch_stop_on_emulation_error(CPUState *cs) X86CPU *cpu = X86_CPU(cs); CPUX86State *env = &cpu->env; - kvm_cpu_synchronize_state(env); + kvm_cpu_synchronize_state(env, KVM_REGSYNC_FULL_STATE); return !(env->cr[0] & CR0_PE_MASK) || ((env->segs[R_CS].selector & 3) != 3); }