From patchwork Mon Aug 1 15:27:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 1026182 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p71FTTtK021791 for ; Mon, 1 Aug 2011 15:29:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753110Ab1HAP30 (ORCPT ); Mon, 1 Aug 2011 11:29:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:65320 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753118Ab1HAP3R (ORCPT ); Mon, 1 Aug 2011 11:29:17 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p71FTGIb011783 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 1 Aug 2011 11:29:16 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p71FTGSB026339; Mon, 1 Aug 2011 11:29:16 -0400 Received: from amt.cnet (vpn-9-44.rdu.redhat.com [10.11.9.44]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p71FTF84022564; Mon, 1 Aug 2011 11:29:15 -0400 Received: from amt.cnet (amt.cnet [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id E830E65E051; Mon, 1 Aug 2011 12:28:31 -0300 (BRT) Received: (from marcelo@localhost) by amt.cnet (8.14.5/8.14.5/Submit) id p71FSVGC005849; Mon, 1 Aug 2011 12:28:31 -0300 Message-Id: <20110801152820.318186742@redhat.com> User-Agent: quilt/0.48-1 Date: Mon, 01 Aug 2011 12:27:27 -0300 From: Marcelo Tosatti To: kvm@vger.kernel.org Cc: Marcelo Tosatti Subject: [patch 5/5] kvm-tpr-opt: delete CPUState field References: <20110801152722.231510187@redhat.com> Content-Disposition: inline; filename=kvmtpr-remove-cpustate-field X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Mon, 01 Aug 2011 15:29:29 +0000 (UTC) The information can be inferred from CPU_PUT_FULL_STATE and bios_enabled. Signed-off-by: Marcelo Tosatti --- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: qemu-kvm/kvm-tpr-opt.c =================================================================== --- qemu-kvm.orig/kvm-tpr-opt.c +++ qemu-kvm/kvm-tpr-opt.c @@ -218,7 +218,7 @@ static int get_pcr_cpu(CPUState *env) return (int)b; } -int kvm_tpr_enable_vapic(CPUState *env) +static int tpr_enable_vapic(CPUState *env) { static uint8_t one = 1; int pcr_cpu = get_pcr_cpu(env); @@ -228,11 +228,17 @@ int kvm_tpr_enable_vapic(CPUState *env) kvm_enable_vapic(env, vapic_phys + (pcr_cpu << 7)); cpu_physical_memory_write_rom(vapic_phys + (pcr_cpu << 7) + 4, &one, 1); - env->kvm_vcpu_update_vapic = 0; bios_enabled = 1; return 1; } +void kvm_tpr_enable_vapic(CPUState *env) +{ + if (!bios_enabled) + return; + tpr_enable_vapic(env); +} + static void patch_call(CPUState *env, uint64_t rip, uint32_t target) { uint32_t offset; @@ -293,7 +299,7 @@ void kvm_tpr_access_report(CPUState *env return; if (!bios_is_mapped(env, rip)) return; - if (!kvm_tpr_enable_vapic(env)) + if (!tpr_enable_vapic(env)) return; patch_instruction(env, rip); } @@ -326,13 +332,6 @@ static int tpr_load(QEMUFile *f, void *s qemu_get_be32s(f, &vapic_phys); qemu_get_be32s(f, &vbios_desc_phys); - if (bios_enabled) { - CPUState *env = first_cpu->next_cpu; - - for (env = first_cpu; env != NULL; env = env->next_cpu) - env->kvm_vcpu_update_vapic = 1; - } - return 0; } @@ -367,7 +366,7 @@ static void vtpr_ioport_write(void *opaq } bios_enabled = 1; update_vbios_real_tpr(); - kvm_tpr_enable_vapic(env); + tpr_enable_vapic(env); } static void kvm_tpr_opt_setup(void) Index: qemu-kvm/qemu-kvm.h =================================================================== --- qemu-kvm.orig/qemu-kvm.h +++ qemu-kvm/qemu-kvm.h @@ -265,6 +265,6 @@ extern int kvm_pit_reinject; extern unsigned int kvm_shadow_memory; int kvm_handle_tpr_access(CPUState *env); -int kvm_tpr_enable_vapic(CPUState *env); +void kvm_tpr_enable_vapic(CPUState *env); #endif Index: qemu-kvm/target-i386/cpu.h =================================================================== --- qemu-kvm.orig/target-i386/cpu.h +++ qemu-kvm/target-i386/cpu.h @@ -759,8 +759,6 @@ typedef struct CPUX86State { uint16_t fptag_vmstate; uint16_t fpregs_format_vmstate; - int kvm_vcpu_update_vapic; - uint64_t xstate_bv; XMMReg ymmh_regs[CPU_NB_REGS]; Index: qemu-kvm/target-i386/kvm.c =================================================================== --- qemu-kvm.orig/target-i386/kvm.c +++ qemu-kvm/target-i386/kvm.c @@ -1451,9 +1451,7 @@ int kvm_arch_put_registers(CPUState *env return ret; } if (level == KVM_PUT_FULL_STATE) { - if (env->kvm_vcpu_update_vapic) { - kvm_tpr_enable_vapic(env); - } + kvm_tpr_enable_vapic(env); } /* must be last */ ret = kvm_guest_debug_workarounds(env);