From patchwork Thu May 15 16:51:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 4183911 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9CF35BFF02 for ; Thu, 15 May 2014 16:53:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D00EC20386 for ; Thu, 15 May 2014 16:53:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 06A5F20381 for ; Thu, 15 May 2014 16:53:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754812AbaEOQwo (ORCPT ); Thu, 15 May 2014 12:52:44 -0400 Received: from mail-wi0-f180.google.com ([209.85.212.180]:46877 "EHLO mail-wi0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753265AbaEOQvq (ORCPT ); Thu, 15 May 2014 12:51:46 -0400 Received: by mail-wi0-f180.google.com with SMTP id hi2so4553193wib.1 for ; Thu, 15 May 2014 09:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=0C6NxrYjN5W9+zU3PC18EAfDSqQTdzqsBicMOnj9ZBs=; b=Q7KfB660sP39qFJmxZREDP35D3AP4PGhNnM/dMeg43bNd88ELM1uWLKj6myjrd6SRM UTKi1PNQxu5SiQkFWE8MvaPPl7lqDagtjgZSP+Mb5D1kQjjyOE7J6mFN1VIcksYUIQdw pVt7X1EXELOrbPQ0YVmUZfQpxwBilux1IW1C43mdN//HBbuC+5UA1lVHe86DJzAARrlR 5/qzWK8mHFJT7UNw7NL44CWUFHLj7p6+yzlXJXDIlYfKoXUaq84XU+qPkDCiCtujJPXw oqEn7wZMpCrcwkswe3PEh3GZNlRPX8bb/zXUTX4HqTqzrBjHMX18rSX1qXnzsJd4o2xo ELrA== X-Received: by 10.180.100.41 with SMTP id ev9mr32239306wib.22.1400172704733; Thu, 15 May 2014 09:51:44 -0700 (PDT) Received: from playground.com (net-37-117-141-58.cust.vodafonedsl.it. [37.117.141.58]) by mx.google.com with ESMTPSA id q2sm34568884wix.5.2014.05.15.09.51.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 May 2014 09:51:43 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org Cc: jan.kiszka@siemens.com, kvm@vger.kernel.org, gleb@kernel.org, avi.kivity@gmail.com Subject: [PATCH v2 2/4] KVM: x86: drop set_rflags callback Date: Thu, 15 May 2014 18:51:29 +0200 Message-Id: <1400172691-27030-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1400172691-27030-1-git-send-email-pbonzini@redhat.com> References: <1400172691-27030-1-git-send-email-pbonzini@redhat.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable 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 Not needed anymore now that the CPL is computed directly by the task switch code. Signed-off-by: Paolo Bonzini --- arch/x86/include/asm/kvm_emulate.h | 1 - arch/x86/kvm/x86.c | 6 ------ 2 files changed, 7 deletions(-) diff --git a/arch/x86/include/asm/kvm_emulate.h b/arch/x86/include/asm/kvm_emulate.h index 24ec1216596e..a04fe4eb237d 100644 --- a/arch/x86/include/asm/kvm_emulate.h +++ b/arch/x86/include/asm/kvm_emulate.h @@ -189,7 +189,6 @@ struct x86_emulate_ops { void (*set_idt)(struct x86_emulate_ctxt *ctxt, struct desc_ptr *dt); ulong (*get_cr)(struct x86_emulate_ctxt *ctxt, int cr); int (*set_cr)(struct x86_emulate_ctxt *ctxt, int cr, ulong val); - void (*set_rflags)(struct x86_emulate_ctxt *ctxt, ulong val); int (*cpl)(struct x86_emulate_ctxt *ctxt); int (*get_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong *dest); int (*set_dr)(struct x86_emulate_ctxt *ctxt, int dr, ulong value); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index fb313fc896dd..57eac309c22e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4646,11 +4646,6 @@ static int emulator_set_cr(struct x86_emulate_ctxt *ctxt, int cr, ulong val) return res; } -static void emulator_set_rflags(struct x86_emulate_ctxt *ctxt, ulong val) -{ - kvm_set_rflags(emul_to_vcpu(ctxt), val); -} - static int emulator_get_cpl(struct x86_emulate_ctxt *ctxt) { return kvm_x86_ops->get_cpl(emul_to_vcpu(ctxt)); @@ -4835,7 +4830,6 @@ static const struct x86_emulate_ops emulate_ops = { .set_idt = emulator_set_idt, .get_cr = emulator_get_cr, .set_cr = emulator_set_cr, - .set_rflags = emulator_set_rflags, .cpl = emulator_get_cpl, .get_dr = emulator_get_dr, .set_dr = emulator_set_dr,