From patchwork Wed Oct 26 11:09:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 121881 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 957721007D9 for ; Wed, 26 Oct 2011 22:10:03 +1100 (EST) Received: from localhost ([::1]:39852 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ1Mr-0006Xb-TA for incoming@patchwork.ozlabs.org; Wed, 26 Oct 2011 07:09:57 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56440) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ1Ml-0006XS-JH for qemu-devel@nongnu.org; Wed, 26 Oct 2011 07:09:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJ1Mk-0000jG-Fr for qemu-devel@nongnu.org; Wed, 26 Oct 2011 07:09:51 -0400 Received: from goliath.siemens.de ([192.35.17.28]:29661) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJ1Mk-0000ix-50 for qemu-devel@nongnu.org; Wed, 26 Oct 2011 07:09:50 -0400 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id p9QB9lkJ026212; Wed, 26 Oct 2011 13:09:47 +0200 Received: from mchn199C.mchp.siemens.de ([139.25.109.49]) by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p9QB9jOb014027; Wed, 26 Oct 2011 13:09:46 +0200 Message-ID: <4EA7EA79.1090503@siemens.com> Date: Wed, 26 Oct 2011 13:09:45 +0200 From: Jan Kiszka User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 To: Avi Kivity , Marcelo Tosatti X-Enigmail-Version: 1.3.2 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 192.35.17.28 Cc: qemu-devel , kvm Subject: [Qemu-devel] [PATCH] kvm: x86: Drop redundant apic base and tpr update from kvm_get_sregs 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 The latter was already commented out, the former is redundant as well. We always get the latest changes after return from the guest via kvm_arch_post_run. Signed-off-by: Jan Kiszka --- target-i386/kvm.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index ddd115c..ffd6488 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1081,10 +1081,9 @@ static int kvm_get_sregs(CPUState *env) env->cr[3] = sregs.cr3; env->cr[4] = sregs.cr4; - cpu_set_apic_base(env->apic_state, sregs.apic_base); - env->efer = sregs.efer; - //cpu_set_apic_tpr(env->apic_state, sregs.cr8); + + /* changes to apic base and cr8/tpr are read back via kvm_arch_post_run */ #define HFLAG_COPY_MASK \ ~( HF_CPL_MASK | HF_PE_MASK | HF_MP_MASK | HF_EM_MASK | \