From patchwork Fri Dec 21 13:56:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jason J. Herne" X-Patchwork-Id: 207814 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 E025F2C0082 for ; Sat, 22 Dec 2012 00:56:58 +1100 (EST) Received: from localhost ([::1]:42160 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm35t-00032o-4u for incoming@patchwork.ozlabs.org; Fri, 21 Dec 2012 08:56:57 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56491) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm35G-0001av-BL for qemu-devel@nongnu.org; Fri, 21 Dec 2012 08:56:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tm358-0004nT-P1 for qemu-devel@nongnu.org; Fri, 21 Dec 2012 08:56:18 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:55695) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tm358-0004nJ-IT for qemu-devel@nongnu.org; Fri, 21 Dec 2012 08:56:10 -0500 Received: from /spool/local by e39.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Dec 2012 06:56:09 -0700 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e39.co.us.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 21 Dec 2012 06:56:07 -0700 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id F1F661FF0046 for ; Fri, 21 Dec 2012 06:55:58 -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 qBLDu5jB202212 for ; Fri, 21 Dec 2012 06:56:05 -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 qBLDu47Y010578 for ; Fri, 21 Dec 2012 06:56:04 -0700 Received: from w500-1204.ibm.com (sig-9-49-152-5.mts.ibm.com [9.49.152.5]) by d03av03.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qBLDu1vG010388; Fri, 21 Dec 2012 06:56:02 -0700 From: "Jason J. Herne" To: borntraeger@de.ibm.com, qemu-devel@nongnu.org, jan.kiszka@siemens.com, agraf@suse.de, jfrei@linux.vnet.ibm.com, graalfs@linux.vnet.ibm.com Date: Fri, 21 Dec 2012 08:56:01 -0500 Message-Id: <1356098161-4848-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: 12122113-3620-0000-0000-000000B4563C X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 32.97.110.160 Cc: "Jason J. Herne" Subject: [Qemu-devel] [PATCH 3/7] KVM regsync: Add register level parameter to do_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" do_kvm_cpu_synchronize_state is called via run_on_cpu, so we can only pass a single argument. Create SyncStateArgs struct for this purpose and add register level data member to it. Signed-off-by: Jason J. Herne Reviewed-by: Christian Borntraeger --- include/sysemu/kvm.h | 6 ++++++ kvm-all.c | 16 ++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index c19b9d1..9a0e071 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -230,6 +230,12 @@ int kvm_check_extension(KVMState *s, unsigned int extension); uint32_t kvm_arch_get_supported_cpuid(KVMState *env, uint32_t function, uint32_t index, int reg); + +struct kvm_cpu_syncstate_args { + CPUArchState *env; + int register_level; +}; + void kvm_cpu_synchronize_state(CPUArchState *env); void kvm_cpu_synchronize_post_reset(CPUArchState *env); void kvm_cpu_synchronize_post_init(CPUArchState *env); diff --git a/kvm-all.c b/kvm-all.c index fceda59..d227e8b 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1486,22 +1486,26 @@ void kvm_flush_coalesced_mmio_buffer(void) s->coalesced_flush_in_progress = false; } -static void do_kvm_cpu_synchronize_state(void *_env) +static void do_kvm_cpu_synchronize_state(void *_args) { - CPUArchState *env = _env; + struct kvm_cpu_syncstate_args *args = _args; - if (!env->kvm_vcpu_dirty) { - kvm_arch_get_registers(env, KVM_REGSYNC_FULL_STATE); - env->kvm_vcpu_dirty = 1; + if (!args->env->kvm_vcpu_dirty) { + kvm_arch_get_registers(args->env, args->register_level); + args->env->kvm_vcpu_dirty = 1; } } void kvm_cpu_synchronize_state(CPUArchState *env) { CPUState *cpu = ENV_GET_CPU(env); + struct kvm_cpu_syncstate_args args; + + args.env = env; + args.register_level = KVM_REGSYNC_FULL_STATE; if (!env->kvm_vcpu_dirty) { - run_on_cpu(cpu, do_kvm_cpu_synchronize_state, env); + run_on_cpu(cpu, do_kvm_cpu_synchronize_state, &args); } }