From patchwork Tue Jun 25 08:51:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Chunqi Li X-Patchwork-Id: 2775281 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 722BD9F3A0 for ; Tue, 25 Jun 2013 08:51:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3AF7E201AA for ; Tue, 25 Jun 2013 08:51:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E0E472019A for ; Tue, 25 Jun 2013 08:51:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752643Ab3FYIvs (ORCPT ); Tue, 25 Jun 2013 04:51:48 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:42752 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752693Ab3FYIvq (ORCPT ); Tue, 25 Jun 2013 04:51:46 -0400 Received: by mail-pa0-f45.google.com with SMTP id bi5so12351291pad.4 for ; Tue, 25 Jun 2013 01:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=eexc4mW0D0AMseBoPL34BHAkU8XASeuUYmb+alUkrBE=; b=S9jjLQ+79iU9RdWdsXthlQaozT78Clez+38AmMLrSSKiZKMYp/g9fb0pmErdVMRdaU 1uyosCu0fPCUsZc419pNa1t1cQc+l/PmplK9bCQFsFDokDMMlAsmp1eXt/XN8UKMr5Vc sjiSCxKz0FOqadjzPDyJ6/9Msnr+AmL+W4ESRlhWTt0hIEAMy22GZ1zaktv7LtDvb4cd am+dvbwnfLyhH85JvYz63c4gZJSwXusQTgxbpJJPy27Q4VmhKSnTe0qMq5qwSjq2vJaB wZn360IuahTZ5UfG+iV1e0haPxoEw13T639BOGfQ7enVDRU+oFvjmAkSZjIjVdV95AQD Rp2Q== X-Received: by 10.66.251.202 with SMTP id zm10mr31531976pac.53.1372150305774; Tue, 25 Jun 2013 01:51:45 -0700 (PDT) Received: from Blade1-02.Blade1-02 ([162.105.146.101]) by mx.google.com with ESMTPSA id pb5sm22184793pbc.29.2013.06.25.01.51.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 01:51:44 -0700 (PDT) From: Arthur Chunqi Li To: kvm@vger.kernel.org Cc: gleb@redhat.com, pbonzini@redhat.com, jan.kiszka@web.de, Arthur Chunqi Li Subject: [PATCH 1/3] emulator: fix confused param list Date: Tue, 25 Jun 2013 16:51:29 +0800 Message-Id: <1372150291-31096-1-git-send-email-yzt356@gmail.com> X-Mailer: git-send-email 1.7.9.5 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Fix param list of test_mmx_movq_mf and test_movabs. The previous version uses "insn_page" and "insn_ram" which are not used afterwards. There are also two variants named "insn_page" and "insn_ram", which has no relation with these two functions. Signed-off-by: Arthur Chunqi Li --- x86/emulator.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) mode change 100644 => 100755 x86/emulator.c diff --git a/x86/emulator.c b/x86/emulator.c old mode 100644 new mode 100755 index 68d2b93..6972334 --- a/x86/emulator.c +++ b/x86/emulator.c @@ -786,8 +786,7 @@ static void advance_rip_by_3_and_note_exception(struct ex_regs *regs) regs->rip += 3; } -static void test_mmx_movq_mf(uint64_t *mem, uint8_t *insn_page, - uint8_t *alt_insn_page, void *insn_ram) +static void test_mmx_movq_mf(uint64_t *mem, uint8_t *alt_insn_page) { uint16_t fcw = 0; /* all exceptions unmasked */ /* movq %mm0, (%rax) */ @@ -808,8 +807,7 @@ static void test_mmx_movq_mf(uint64_t *mem, uint8_t *insn_page, handle_exception(MF_VECTOR, 0); } -static void test_movabs(uint64_t *mem, uint8_t *insn_page, - uint8_t *alt_insn_page, void *insn_ram) +static void test_movabs(uint64_t *mem, uint8_t *alt_insn_page) { /* mov $0x9090909090909090, %rcx */ MK_INSN(movabs, "mov $0x9090909090909090, %rcx\n\t"); @@ -1012,8 +1010,8 @@ int main() test_lldt(mem); test_ltr(mem); - test_mmx_movq_mf(mem, insn_page, alt_insn_page, insn_ram); - test_movabs(mem, insn_page, alt_insn_page, insn_ram); + test_mmx_movq_mf(mem, alt_insn_page); + test_movabs(mem, alt_insn_page); test_crosspage_mmio(mem);