From patchwork Tue Apr 12 09:36:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gleb Natapov X-Patchwork-Id: 699571 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p3C9aaWZ000415 for ; Tue, 12 Apr 2011 09:36:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756801Ab1DLJg3 (ORCPT ); Tue, 12 Apr 2011 05:36:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15794 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753523Ab1DLJg2 (ORCPT ); Tue, 12 Apr 2011 05:36:28 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3C9aR86010119 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 12 Apr 2011 05:36:27 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3C9aQhE015425; Tue, 12 Apr 2011 05:36:27 -0400 Received: by dhcp-1-237.tlv.redhat.com (Postfix, from userid 13519) id A9EB518D3EB; Tue, 12 Apr 2011 12:36:25 +0300 (IDT) From: Gleb Natapov To: kvm@vger.kernel.org Cc: avi@redhat.com, mtosatti@redhat.com Subject: [PATCH 3/5] KVM: emulator: Propagate fault in far jump emulation. Date: Tue, 12 Apr 2011 12:36:23 +0300 Message-Id: <1302600985-10704-3-git-send-email-gleb@redhat.com> In-Reply-To: <1302600985-10704-1-git-send-email-gleb@redhat.com> References: <1302600985-10704-1-git-send-email-gleb@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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]); Tue, 12 Apr 2011 09:36:36 +0000 (UTC) Signed-off-by: Gleb Natapov --- arch/x86/kvm/emulate.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index eb4c7eb..4f95249 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -3876,7 +3876,8 @@ special_insn: jump_far: memcpy(&sel, c->src.valptr + c->op_bytes, 2); - if (load_segment_descriptor(ctxt, ops, sel, VCPU_SREG_CS)) + rc = load_segment_descriptor(ctxt, ops, sel, VCPU_SREG_CS); + if (rc != X86EMUL_CONTINUE) goto done; c->eip = 0;