[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] target-i386: Mark cpu_vmexit noreturn
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 3/4] target-i386: Mark cpu_vmexit noreturn |
Date: |
Tue, 3 Apr 2018 17:00:56 +0200 |
From: Jan Kiszka <address@hidden>
It calls cpu_loop_exit in system emulation mode (and should never be
called in user emulation mode).
Signed-off-by: Jan Kiszka <address@hidden>
---
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,
--
2.13.6
- [Qemu-devel] [PATCH 0/4] target-i386: Enhance SVM support, Jan Kiszka, 2018/04/03
- [Qemu-devel] [PATCH 2/4] target-i386: Allow interrupt injection after STGI, Jan Kiszka, 2018/04/03
- [Qemu-devel] [PATCH 3/4] target-i386: Mark cpu_vmexit noreturn,
Jan Kiszka <=
- [Qemu-devel] [PATCH 1/4] target-i386: Add NMI interception to SVM, Jan Kiszka, 2018/04/03
- [Qemu-devel] [PATCH 4/4] target-i386: Add NPT support, Jan Kiszka, 2018/04/03
- Re: [Qemu-devel] [PATCH 0/4] target-i386: Enhance SVM support, no-reply, 2018/04/03
- Re: [Qemu-devel] [PATCH 0/4] target-i386: Enhance SVM support, no-reply, 2018/04/03