From patchwork Mon Dec 16 09:57:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 3352781 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 A33A3C0D4A for ; Mon, 16 Dec 2013 09:58:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9857420375 for ; Mon, 16 Dec 2013 09:58:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8778920378 for ; Mon, 16 Dec 2013 09:58:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753234Ab3LPJ57 (ORCPT ); Mon, 16 Dec 2013 04:57:59 -0500 Received: from goliath.siemens.de ([192.35.17.28]:34513 "EHLO goliath.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753208Ab3LPJ5m (ORCPT ); Mon, 16 Dec 2013 04:57:42 -0500 Received: from mail1.siemens.de (localhost [127.0.0.1]) by goliath.siemens.de (8.13.6/8.13.6) with ESMTP id rBG9va2Q002980; Mon, 16 Dec 2013 10:57:36 +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 rBG9vTCE007502; Mon, 16 Dec 2013 10:57:35 +0100 From: Jan Kiszka To: Gleb Natapov , Paolo Bonzini Cc: kvm , Arthur Chunqi Li Subject: [PATCH 12/15] VMX: Simplify basic handlers Date: Mon, 16 Dec 2013 10:57:25 +0100 Message-Id: <1b19ac40e772e397afa38e3e7c0e06ff589cbc13.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 Be less verbose and remove any unused code from the basic handlers. Properly fail if a vmexit occurs during the early tests. Signed-off-by: Jan Kiszka --- x86/vmx_tests.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index fe7bbdf..36c56b4 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -44,27 +44,11 @@ static inline u32 get_stage() void basic_guest_main() { - /* Here is a basic guest_main, print Hello World */ - printf("\tHello World, this is null_guest_main!\n"); } int basic_exit_handler() { - u64 guest_rip; - ulong reason; - - guest_rip = vmcs_read(GUEST_RIP); - reason = vmcs_read(EXI_REASON) & 0xff; - - switch (reason) { - case VMX_VMCALL: - print_vmexit_info(); - vmcs_write(GUEST_RIP, guest_rip + 3); - return VMX_TEST_RESUME; - default: - break; - } - printf("ERROR : Unhandled vmx exit.\n"); + report("Basic VMX test", 0); print_vmexit_info(); return VMX_TEST_EXIT; }