From patchwork Fri Dec 18 08:48:42 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sheng Yang X-Patchwork-Id: 68633 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBI8mvLM003872 for ; Fri, 18 Dec 2009 08:48:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751239AbZLRIs4 (ORCPT ); Fri, 18 Dec 2009 03:48:56 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751234AbZLRIsz (ORCPT ); Fri, 18 Dec 2009 03:48:55 -0500 Received: from mga02.intel.com ([134.134.136.20]:47813 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751219AbZLRIsy (ORCPT ); Fri, 18 Dec 2009 03:48:54 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 18 Dec 2009 00:47:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,417,1257148800"; d="scan'208";a="477313921" Received: from syang10-desktop.sh.intel.com (HELO syang10-desktop) ([10.239.36.76]) by orsmga002.jf.intel.com with ESMTP; 18 Dec 2009 00:48:38 -0800 Received: from yasker by syang10-desktop with local (Exim 4.69) (envelope-from ) id 1NLYW5-0002VQ-G4; Fri, 18 Dec 2009 16:48:53 +0800 From: Sheng Yang To: Avi Kivity , Marcelo Tosatti Cc: kvm@vger.kernel.org, Sheng Yang Subject: [PATCH 1/6] KVM: VMX: Remove redundant variable Date: Fri, 18 Dec 2009 16:48:42 +0800 Message-Id: <1261126127-9603-2-git-send-email-sheng@linux.intel.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1261126127-9603-1-git-send-email-sheng@linux.intel.com> References: <1261126127-9603-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 9a0a2cf..5c464ed 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -2383,14 +2383,12 @@ static int vmx_vcpu_setup(struct vcpu_vmx *vmx) for (i = 0; i < NR_VMX_MSR; ++i) { u32 index = vmx_msr_index[i]; u32 data_low, data_high; - u64 data; int j = vmx->nmsrs; if (rdmsr_safe(index, &data_low, &data_high) < 0) continue; if (wrmsr_safe(index, data_low, data_high) < 0) continue; - data = data_low | ((u64)data_high << 32); vmx->guest_msrs[j].index = i; vmx->guest_msrs[j].data = 0; vmx->guest_msrs[j].mask = -1ull;