From patchwork Tue Apr 3 15:36:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 894662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=web.de Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40Ftf80s8Zz9s0b for ; Wed, 4 Apr 2018 01:43:12 +1000 (AEST) Received: from localhost ([::1]:43830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3O5W-0004sv-7F for incoming@patchwork.ozlabs.org; Tue, 03 Apr 2018 11:43:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f3NzF-00004x-Gq for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:36:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f3NzE-0008Db-PL for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:36:41 -0400 Received: from mout.web.de ([212.227.15.4]:45141) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f3NzE-0008Cl-CB for qemu-devel@nongnu.org; Tue, 03 Apr 2018 11:36:40 -0400 Received: from md1f2u6c.ww002.siemens.net ([92.77.50.102]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0MBY4U-1fClN042Pm-00AW1h; Tue, 03 Apr 2018 17:36:25 +0200 From: Jan Kiszka To: qemu-devel , Paolo Bonzini , Richard Henderson , Eduardo Habkost Date: Tue, 3 Apr 2018 17:36:13 +0200 Message-Id: <6f4d44ffde55d074cbceb48309c1678600abad2f.1522769774.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:ajZfQ68Md/SYlFv6OBljw63/lUJjHyv8CUKmfOSy5z6cXUwOog7 tqkfDIele7BO/tpTSNZibnxR5zUUfF1NEBRmbVIMvF0d96hFnVSOZODlgaAboHDKUxTLo3n 3YIFIV2r4luLmIQVLNxY5PiPErQ5S6xXDo0F4kJAEcqDx3BybZV2Y1pr/Ny1K345qHCwD99 Lh55v1kxuByCLv76xJR8g== X-UI-Out-Filterresults: notjunk:1; V01:K0:OcHhzKLc1vQ=:LacfRIz4lFoBe6lZGL+VLU tLxWyzdMd43SKhWP5GLTBhxm9179KboYa6RlHYZIL7NDXiADgTtut0BmFKodDMot/M5yY5CAh OY7glXNcds0My5IAhvyRFyTZjYOWgeaoUDElPnD7vZZgucEmmSyJ2+OeMV8xSkJb3DPRqDLhf fRCNBosOF/PwVd2cMFI7m+l+ghObpCx3ZIBeWWILYwUB2zANziUCt999k2/VcXNdks4xzyA9W wWtAYcBMquXUtIzIDu/eTOU7mtBdH+SIpVuhZc7wXg2ngYfHHUbJsHh/tXquX3+TXQD6gV+WG yKhcKLqlsTTy7t5/W/utQ2q9aXYKtaJw4Ujan2qOGpNmMJoidNmlNXMkQJJ2KG+ya47SGRL2c LjXe9qtFFzZ9Y0lNUVO/Lym28zHXyR36e3eMl0XsiU1i1FP8c/T/klORT7hBHZQopTOLg+y1o n6HVHRcWwsdCahdb8AFMxOyvlyVTi19N3lxIpLsi8ljPkS2PotyLTuc0oHsf9+zlBNiJb0tFW a1gK8CHi4EqvtE8uZYDoqMbLCEdtmF96SgTYj5KgNec/PkhS3Doekh9U2qA+5yxmrAWgWgX3X mo71/F9t05Gtl6GMgYqaerz+/0a6msQtLHfhnbqt0CPsNFlX/Y+JSRVILGtWozirsW5clfeW5 neanx/aW8oQKIsPMoJruJjlddPdJixlGhcwZhXzbggg71Tu21XNSYE5AkrrDnBvV/ypbEXOVo uQHXsRV6of2xCAFqhNW2Lp2OA2rwKuU4SRkoQhOk7xdYXTKyNdZbcT6jSsa5egGeOXQ/6KvVc uj4nexzurYMiFGUE6vloBCQYOHHTQ== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.15.4 Subject: [Qemu-devel] [PATCH v2 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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,