From patchwork Mon Dec 16 09:57:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3352811 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 C85BF9F44E for ; Mon, 16 Dec 2013 09:58:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A8A4920364 for ; Mon, 16 Dec 2013 09:58:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8960D20270 for ; Mon, 16 Dec 2013 09:58:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753054Ab3LPJ6M (ORCPT ); Mon, 16 Dec 2013 04:58:12 -0500 Received: from david.siemens.de ([192.35.17.14]:28097 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753189Ab3LPJ5k (ORCPT ); Mon, 16 Dec 2013 04:57:40 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by david.siemens.de (8.13.6/8.13.6) with ESMTP id rBG9vXZe025137; Mon, 16 Dec 2013 10:57:33 +0100 Received: from mchn199C.mchp.siemens.de.com ([146.254.78.38]) by mail1.siemens.de (8.14.3/8.14.3) with SMTP id rBG9vTC9007502; Mon, 16 Dec 2013 10:57:33 +0100 From: Jan Kiszka To: Gleb Natapov , Paolo Bonzini Cc: kvm , Arthur Chunqi Li Subject: [PATCH 07/15] VMX: Remove unneeded basic_init Date: Mon, 16 Dec 2013 10:57:20 +0100 Message-Id: <1151d6ad66a10dade66732a6ec76fc19c5580fae.1387187847.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 1.8.1.1.298.ge7eed54 In-Reply-To: References: In-Reply-To: References: 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, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, 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 We already accept the init handler to be NULL if there is no need for initialization. Signed-off-by: Jan Kiszka --- x86/vmx_tests.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index 74d633b..a25afdc 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -43,10 +43,6 @@ static inline u32 get_stage() return s; } -void basic_init() -{ -} - void basic_guest_main() { /* Here is a basic guest_main, print Hello World */ @@ -1134,9 +1130,9 @@ static int ept_exit_handler() /* name/init/guest_main/exit_handler/syscall_handler/guest_regs basic_* just implement some basic functions */ struct vmx_test vmx_tests[] = { - { "null", basic_init, basic_guest_main, basic_exit_handler, + { "null", NULL, basic_guest_main, basic_exit_handler, basic_syscall_handler, {0} }, - { "vmenter", basic_init, vmenter_main, vmenter_exit_handler, + { "vmenter", NULL, vmenter_main, vmenter_exit_handler, basic_syscall_handler, {0} }, { "preemption timer", preemption_timer_init, preemption_timer_main, preemption_timer_exit_handler, basic_syscall_handler, {0} }, @@ -1144,7 +1140,7 @@ struct vmx_test vmx_tests[] = { test_ctrl_pat_exit_handler, basic_syscall_handler, {0} }, { "control field EFER", test_ctrl_efer_init, test_ctrl_efer_main, test_ctrl_efer_exit_handler, basic_syscall_handler, {0} }, - { "CR shadowing", basic_init, cr_shadowing_main, + { "CR shadowing", NULL, cr_shadowing_main, cr_shadowing_exit_handler, basic_syscall_handler, {0} }, { "I/O bitmap", iobmp_init, iobmp_main, iobmp_exit_handler, basic_syscall_handler, {0} },