From patchwork Sun May 1 17:23:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Takuya Yoshikawa X-Patchwork-Id: 746212 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p41HNK9b003981 for ; Sun, 1 May 2011 17:23:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755341Ab1EARXS (ORCPT ); Sun, 1 May 2011 13:23:18 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:47728 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458Ab1EARXR (ORCPT ); Sun, 1 May 2011 13:23:17 -0400 Received: by pvg12 with SMTP id 12so2908317pvg.19 for ; Sun, 01 May 2011 10:23:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:date:from:to:cc:subject:message-id:in-reply-to :references:x-mailer:mime-version:content-type :content-transfer-encoding; bh=1zKbd4hg3G4uR2uCztMPr/6+o+vz2lYHVKzkv4fHJ20=; b=Kk8c6y7TMKj//+bm44o2C4oNhE+727e7qM5pEu72bKJHyV7tLnvLvKzp08RMl2/Zaw sDhevC+lWYfYx80eyx4GTUyPfBY5XGArXDUKMckK4P8yICTFTWvaPKi1J9Z9xt26YNcI i2ZYBmC3pZ8EWouR/tFn/l38Mg/AquUxbByYY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; b=x6WII/HeM/uVfs0nGzPCNIgBnwZqpwU9LPtFPpWmCOYjRbgLlAxuLc0N3rl1y3Xtu9 2NeTGrmhqJmXizZJal7B1bMQLXoeh4AOjvItxOZbHa1yWG5FuvlRl8s/ioOaMrmRj7N+ KQFajiTqE15V3Zv6GJ2zhP3RMHQH501RjJi/w= Received: by 10.68.19.227 with SMTP id i3mr7783919pbe.303.1304270597375; Sun, 01 May 2011 10:23:17 -0700 (PDT) Received: from amd (s198099.dynamic.ppp.asahi-net.or.jp [220.157.198.99]) by mx.google.com with ESMTPS id k3sm3268918pbc.0.2011.05.01.10.23.15 (version=SSLv3 cipher=OTHER); Sun, 01 May 2011 10:23:16 -0700 (PDT) Date: Mon, 2 May 2011 02:23:13 +0900 From: Takuya Yoshikawa To: avi@redhat.com, mtosatti@redhat.com Cc: kvm@vger.kernel.org, yoshikawa.takuya@oss.ntt.co.jp Subject: [PATCH 1/6] KVM: x86 emulator: Remove unused opt from seg_override() Message-Id: <20110502022313.e82221c4.takuya.yoshikawa@gmail.com> In-Reply-To: <20110502022143.0ef5d756.takuya.yoshikawa@gmail.com> References: <20110502022143.0ef5d756.takuya.yoshikawa@gmail.com> X-Mailer: Sylpheed 3.1.0beta2 (GTK+ 2.22.0; x86_64-pc-linux-gnu) Mime-Version: 1.0 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 (demeter2.kernel.org [140.211.167.43]); Sun, 01 May 2011 17:23:21 +0000 (UTC) From: Takuya Yoshikawa In addition, one comma at the end of a statement is replaced with a semicolon. Signed-off-by: Takuya Yoshikawa --- arch/x86/kvm/emulate.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index a8faf8d..1545092 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -500,7 +500,6 @@ static unsigned long seg_base(struct x86_emulate_ctxt *ctxt, } static unsigned seg_override(struct x86_emulate_ctxt *ctxt, - struct x86_emulate_ops *ops, struct decode_cache *c) { if (!c->has_seg_override) @@ -3527,7 +3526,7 @@ done_prefixes: if (!c->has_seg_override) set_seg_override(c, VCPU_SREG_DS); - memop.addr.mem.seg = seg_override(ctxt, ops, c); + memop.addr.mem.seg = seg_override(ctxt, c); if (memop.type == OP_MEM && c->ad_bytes != 8) memop.addr.mem.ea = (u32)memop.addr.mem.ea; @@ -3587,7 +3586,7 @@ done_prefixes: c->src.bytes = (c->d & ByteOp) ? 1 : c->op_bytes; c->src.addr.mem.ea = register_address(c, c->regs[VCPU_REGS_RSI]); - c->src.addr.mem.seg = seg_override(ctxt, ops, c), + c->src.addr.mem.seg = seg_override(ctxt, c); c->src.val = 0; break; case SrcImmFAddr: @@ -4103,7 +4102,7 @@ writeback: c->dst.type = saved_dst_type; if ((c->d & SrcMask) == SrcSI) - string_addr_inc(ctxt, seg_override(ctxt, ops, c), + string_addr_inc(ctxt, seg_override(ctxt, c), VCPU_REGS_RSI, &c->src); if ((c->d & DstMask) == DstDI)