From patchwork Mon Jan 26 07:32:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nadav Amit X-Patchwork-Id: 5706951 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A764A9F1D6 for ; Mon, 26 Jan 2015 07:33:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E9FBE20123 for ; Mon, 26 Jan 2015 07:33:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1A61F200E1 for ; Mon, 26 Jan 2015 07:33:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753216AbbAZHdD (ORCPT ); Mon, 26 Jan 2015 02:33:03 -0500 Received: from mailgw10.technion.ac.il ([132.68.225.10]:61505 "EHLO mailgw10.technion.ac.il" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751764AbbAZHcw (ORCPT ); Mon, 26 Jan 2015 02:32:52 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AtkFAFHsxVSERCAB/2dsb2JhbABagwaBK4MAyS0CgRFDAQEBAQEBfIQNAQUjDwFGECUCJgICVxmILL4Ej1KESQEBAQEGAQEBAQEdgSGNc2QHFoJSgUEFjQ2dPiKDcG2BAoFAAQEB X-IPAS-Result: AtkFAFHsxVSERCAB/2dsb2JhbABagwaBK4MAyS0CgRFDAQEBAQEBfIQNAQUjDwFGECUCJgICVxmILL4Ej1KESQEBAQEGAQEBAQEdgSGNc2QHFoJSgUEFjQ2dPiKDcG2BAoFAAQEB X-IronPort-AV: E=Sophos;i="5.09,467,1418076000"; d="scan'208";a="7864485" Received: from csa.cs.technion.ac.il ([132.68.32.1]) by mailgw10.technion.ac.il with ESMTP; 26 Jan 2015 09:32:45 +0200 Received: from csn.cs.technion.ac.il (csn.cs.technion.ac.il [132.68.32.15]) by csa.cs.technion.ac.il (Postfix) with ESMTP id 77070140041; Mon, 26 Jan 2015 09:32:44 +0200 (IST) Received: from csl-tapuz20.cs.technion.ac.il (csl-tapuz20.cs.technion.ac.il [132.68.206.58]) by csn.cs.technion.ac.il (Postfix) with ESMTPSA id 33CDFA1C6F; Mon, 26 Jan 2015 09:32:44 +0200 (IST) From: Nadav Amit To: pbonzini@redhat.com Cc: kvm@vger.kernel.org, Nadav Amit Subject: [PATCH 5/7] KVM: x86: Fix defines in emulator.c Date: Mon, 26 Jan 2015 09:32:25 +0200 Message-Id: <1422257547-4557-6-git-send-email-namit@cs.technion.ac.il> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1422257547-4557-1-git-send-email-namit@cs.technion.ac.il> References: <1422257547-4557-1-git-send-email-namit@cs.technion.ac.il> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Unnecassary define was left after commit 7d882ffa81d5 ("KVM: x86: Revert NoBigReal patch in the emulator”). Commit 39f062ff51b2 ("KVM: x86: Generate #UD when memory operand is required”) was missing undef. Fix it. Signed-off-by: Nadav Amit --- arch/x86/kvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index db3cf39..997c9eb 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -167,7 +167,6 @@ #define NoMod ((u64)1 << 47) /* Mod field is ignored */ #define Intercept ((u64)1 << 48) /* Has valid intercept field */ #define CheckPerm ((u64)1 << 49) /* Has valid check_perm field */ -#define NoBigReal ((u64)1 << 50) /* No big real mode */ #define PrivUD ((u64)1 << 51) /* #UD instead of #GP on CPL > 0 */ #define NearBranch ((u64)1 << 52) /* Near branches */ #define No16 ((u64)1 << 53) /* No 16 bit operand */ @@ -4246,6 +4245,7 @@ static const struct opcode opcode_map_0f_38[256] = { #undef GP #undef EXT #undef MD +#undef ID #undef D2bv #undef D2bvIP