From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH 08/23] KVM: x86 emulator: cleanup some direct calls into kvm to use existing callbacks Date: Wed, 28 Apr 2010 11:59:54 +0300 Message-ID: <4BD7F90A.8060107@redhat.com> References: <1272370524-1295-1-git-send-email-gleb@redhat.com> <1272370524-1295-9-git-send-email-gleb@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: mtosatti@redhat.com, kvm@vger.kernel.org To: Gleb Natapov Return-path: Received: from mx1.redhat.com ([209.132.183.28]:45137 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750864Ab0D1JSW (ORCPT ); Wed, 28 Apr 2010 05:18:22 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3S8xu3o004467 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 28 Apr 2010 04:59:56 -0400 Received: from cleopatra.tlv.redhat.com (cleopatra.tlv.redhat.com [10.35.255.11]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3S8xtFK012698 for ; Wed, 28 Apr 2010 04:59:56 -0400 In-Reply-To: <1272370524-1295-9-git-send-email-gleb@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 04/27/2010 03:15 PM, Gleb Natapov wrote: > Use callbacks from x86_emulate_ops to access segments instead of calling > into kvm directly. > > > > -static unsigned long seg_base(struct x86_emulate_ctxt *ctxt, int seg) > +static unsigned long seg_base(struct x86_emulate_ctxt *ctxt, > + struct x86_emulate_ops *ops, int seg) > { > - if (ctxt->mode == X86EMUL_MODE_PROT64&& seg< VCPU_SREG_FS) > - return 0; > + unsigned long base; > > - return kvm_x86_ops->get_segment_base(ctxt->vcpu, seg); > get_segment_base() is only one vmread on intel, but you replace it with reading the entire segment. > + if (ctxt->mode == X86EMUL_MODE_PROT64) { > + u64 val; > + switch (seg) { > + case VCPU_SREG_FS: > + ops->get_msr(ctxt->vcpu, MSR_FS_BASE,&val); > + break; > + case VCPU_SREG_GS: > + ops->get_msr(ctxt->vcpu, MSR_GS_BASE,&val); > + break; > + default: > + val = 0; > + break; > + } > Why this ugliness? get_cached_descriptor() should do this. > > static unsigned long seg_override_base(struct x86_emulate_ctxt *ctxt, > + struct x86_emulate_ops *ops, > struct decode_cache *c) > { > if (!c->has_seg_override) > return 0; > > - return seg_base(ctxt, c->seg_override); > + return seg_base(ctxt, ops, c->seg_override); > } > Sticking ops into ctxt would reduce the size of these patches. -- error compiling committee.c: too many arguments to function