From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mohammed Gamal Subject: [RFC PATCH v2 2/3] x86 emulator: Add cs_base() helper Date: Thu, 8 Jul 2010 17:10:35 +0300 Message-ID: <1278598236-12103-3-git-send-email-m.gamal005@gmail.com> References: <1278598236-12103-1-git-send-email-m.gamal005@gmail.com> Cc: mtosatti@redhat.com, kvm@vger.kernel.org, Mohammed Gamal To: avi@redhat.com Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:54474 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755856Ab0GHOLL (ORCPT ); Thu, 8 Jul 2010 10:11:11 -0400 Received: by mail-bw0-f46.google.com with SMTP id 1so456893bwz.19 for ; Thu, 08 Jul 2010 07:11:10 -0700 (PDT) In-Reply-To: <1278598236-12103-1-git-send-email-m.gamal005@gmail.com> Sender: kvm-owner@vger.kernel.org List-ID: Adds a cs_base() helper for consistency with other emulator functions Signed-off-by: Mohammed Gamal --- arch/x86/kvm/emulate.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 255473f..6bb7c68 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -643,6 +643,12 @@ static unsigned long seg_override_base(struct x86_emulate_ctxt *ctxt, return seg_base(ctxt, ops, c->seg_override); } +static unsigned long cs_base(struct x86_emulate_ctxt *ctxt, + struct x86_emulate_ops *ops) +{ + return seg_base(ctxt, ops, VCPU_SREG_CS); +} + static unsigned long es_base(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) { @@ -976,7 +982,7 @@ x86_decode_insn(struct x86_emulate_ctxt *ctxt, struct x86_emulate_ops *ops) c->eip = ctxt->eip; c->fetch.start = c->fetch.end = c->eip; - ctxt->cs_base = seg_base(ctxt, ops, VCPU_SREG_CS); + ctxt->cs_base = cs_base(ctxt, ops); switch (mode) { case X86EMUL_MODE_REAL: -- 1.7.0.4