From patchwork Tue Apr 3 15:00:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 10321399 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 392E9602C8 for ; Tue, 3 Apr 2018 15:09:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 238942888C for ; Tue, 3 Apr 2018 15:09:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 16B5128893; Tue, 3 Apr 2018 15:09:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 900B92888C for ; Tue, 3 Apr 2018 15:09:28 +0000 (UTC) Received: from localhost ([::1]:41374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NYt-0007H5-Of for patchwork-qemu-devel@patchwork.kernel.org; Tue, 03 Apr 2018 11:09:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NR8-0000hI-0H for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:01:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3NR3-0000CY-OV for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:01:25 -0400 Received: from mout.web.de ([212.227.15.14]:58665) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f3NR3-0000Bd-Ed for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:01:21 -0400 Received: from md1f2u6c.ww002.siemens.net ([92.77.50.102]) by smtp.web.de (mrweb003 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MBTD4-1fCkom0zsU-00AUeN; Tue, 03 Apr 2018 17:01:06 +0200 From: Jan Kiszka To: qemu-devel , Paolo Bonzini , Richard Henderson , Eduardo Habkost Date: Tue, 3 Apr 2018 17:00:56 +0200 Message-Id: <6f4d44ffde55d074cbceb48309c1678600abad2f.1522767657.git.jan.kiszka@web.de> X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V03:K0:NGshsguwoEUtBpGmoGdluqtD5SI6OvV2WIjsHNnE2lqBEEDJX92 vru1LhQjecbKzw2ptb+xmLXqXfZS3dsL314mUEJ5QSwZoZiNO+c6ujD4W09+L6mzH1neQwJ ot8w5G3/6Viog7T/fvgWEkHDdsoJQhdiFTiiNhebGUtmQGOF/sA2S5mQ/LmuMxdMxaRKv9q 0YsAu0TljBRWiLD3ri5NQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:B1hmZVhElO8=:VcEB0J1dC7+jWXRZW+Z4Ya OeCsem9Ps4urp2qy/zF6qtnLx3Aw68OSbDx4IjwKL18zSBbHz5PdGW66ah5ZsSmrUTTrYUHN4 1cINy12g6enuQSNzlf/L5eb/+0zxBjdQQxc5fmPKnvGZ6N67n3osGca3bkxb9wfEzb+jC3OUy 0SujNddOuL4teYpAMZh2EDL7KjKWZ/4pRXl/Respdvgy7jCHoFGTbzzHLkw102nF6BzkAJcpS O8zjNxWBCy+wTtEbCftkVA23VXyLZ2kR6ZtkfBa4Rx9Cf939+SG0GAUHDEaHrAjTJGbfbb+vQ 7wUIpL5IuvnNhSuSvmaz3RXTPhFgKsVHlk3buRF2OVF0cuMPZQGeoJs+NR1tWaJ3fj59cdkQv Rd0GmragiRIZYUeLsI2X+T5/evjrBK8+q1qmevq7lYtuw7KOP08iHb5xCFrO5ECwa3ppaSaGc iGnp8qCkPkL7TTGh2dOd/ZaxsCbv+00uiSC413Z8mlP7EBctBtA7n5/DxTjkLbCLoK4h2DtcK Qq1DM0rBFE83+1yzhNKjZ8XXNR1V2mYwGZ21so6XMWHKTPPms7LVCL9n+yOnqddkGFy72Rg3V vudyd4EZtcaJ9xqHfQb/PnOej5537cULCZymVhXQ5PcUg8uTOE/q0tLTAdr//2dtctpX5XdEc Q2fu2Hn1HANKd4knpeIPnvMXIzqnLRPaKsbBv3YlErfGT+KxutoVnEA/OKM68GVFTY25lAxtK HpPRolZSJfI0xSXbQwXiZmJFiKBOqeahHe1XWRedKxhq6rIdCTyZsAXVSJOZ0uh//3Y535Sa4 ZcZ1ou4tPXZnSSG941Vo5E2ZMfwLQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.14 Subject: [Qemu-devel] [PATCH 3/4] target-i386: Mark cpu_vmexit noreturn X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Valentine Sinitsyn Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Jan Kiszka It calls cpu_loop_exit in system emulation mode (and should never be called in user emulation mode). Signed-off-by: Jan Kiszka --- target/i386/cpu.h | 4 ++-- target/i386/svm_helper.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 78db1b833a..d711634c2f 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1764,8 +1764,8 @@ void helper_lock_init(void); /* svm_helper.c */ void cpu_svm_check_intercept_param(CPUX86State *env1, uint32_t type, uint64_t param, uintptr_t retaddr); -void cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, uint64_t exit_info_1, - uintptr_t retaddr); +void QEMU_NORETURN cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, + uint64_t exit_info_1, uintptr_t retaddr); void do_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1); /* seg_helper.c */ diff --git a/target/i386/svm_helper.c b/target/i386/svm_helper.c index 303106981c..e3288955f1 100644 --- a/target/i386/svm_helper.c +++ b/target/i386/svm_helper.c @@ -62,6 +62,7 @@ void helper_invlpga(CPUX86State *env, int aflag) void cpu_vmexit(CPUX86State *nenv, uint32_t exit_code, uint64_t exit_info_1, uintptr_t retaddr) { + assert(0); } void helper_svm_check_intercept_param(CPUX86State *env, uint32_t type,