From patchwork Wed Jul 7 21:23:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammed Gamal X-Patchwork-Id: 110699 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o67LPJ0W026917 for ; Wed, 7 Jul 2010 21:25:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756529Ab0GGVZQ (ORCPT ); Wed, 7 Jul 2010 17:25:16 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:64268 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756381Ab0GGVZP (ORCPT ); Wed, 7 Jul 2010 17:25:15 -0400 Received: by bwz1 with SMTP id 1so88158bwz.19 for ; Wed, 07 Jul 2010 14:25:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=gRUkHmvBB6yJaa8WxQtpVpa3MnEmole1/aTFeHv6IwQ=; b=UOsxKyer/0iol0A/enOxKsbofraXt1HOFzEoKKrov8Np0rZtw9m3cZSapClhneym0q SaUdMeZehRhTjlA46CiiPJW0fIS8XxAntow200slKBPU9VpihtTZwUkH1V+TKGK3C5J+ jb1/ITqkhjAawjW/Udu/tTIdKKrmwfvhP01/s= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=q8Vd3qiUJ4HUtg3ES9aK76JBqltVfudlwTWXMzVUoAjazLQp5pCKJ9hoko431Npx2x 2FRbRidrqSZDRfRiIy1EISglgod0SaDqZjUxSRpxv/tcw/F4hOwJCzd6TFXnCqfcAFaH F8QmF6g2yOu6wdJyilmjHEAKfnMyVMqlQ/f4I= Received: by 10.204.23.81 with SMTP id q17mr5495961bkb.196.1278537913795; Wed, 07 Jul 2010 14:25:13 -0700 (PDT) Received: from localhost ([41.238.114.156]) by mx.google.com with ESMTPS id y2sm28302097bkx.8.2010.07.07.14.25.10 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 07 Jul 2010 14:25:13 -0700 (PDT) From: Mohammed Gamal To: avi@redhat.com Cc: mtosatti@redhat.com, kvm@vger.kernel.org, Mohammed Gamal Subject: [RFC PATCH 2/3] x86 emulator: Add cs_base() helper Date: Thu, 8 Jul 2010 00:23:58 +0300 Message-Id: <1278537839-20144-3-git-send-email-m.gamal005@gmail.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1278537839-20144-1-git-send-email-m.gamal005@gmail.com> References: <1278537839-20144-1-git-send-email-m.gamal005@gmail.com> 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.3 (demeter.kernel.org [140.211.167.41]); Wed, 07 Jul 2010 21:25:19 +0000 (UTC) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index e8bdddc..f40479a 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -642,6 +642,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) { @@ -975,7 +981,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: