[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 43/50] target/i386: Inline user cpu_svm_check_intercept_param
From: |
Richard Henderson |
Subject: |
[PATCH v2 43/50] target/i386: Inline user cpu_svm_check_intercept_param |
Date: |
Fri, 14 May 2021 10:13:35 -0500 |
The user-version is a no-op. This lets us completely
remove tcg/user/svm_stubs.c.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/i386/cpu.h | 8 ++++++++
target/i386/tcg/user/svm_stubs.c | 28 ----------------------------
target/i386/tcg/user/meson.build | 1 -
3 files changed, 8 insertions(+), 29 deletions(-)
delete mode 100644 target/i386/tcg/user/svm_stubs.c
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
index 324ef92beb..e6836393f7 100644
--- a/target/i386/cpu.h
+++ b/target/i386/cpu.h
@@ -2146,8 +2146,16 @@ static inline void cpu_set_fpuc(CPUX86State *env,
uint16_t fpuc)
void helper_lock_init(void);
/* svm_helper.c */
+#ifdef CONFIG_USER_ONLY
+static inline void
+cpu_svm_check_intercept_param(CPUX86State *env1, uint32_t type,
+ uint64_t param, uintptr_t retaddr)
+{ /* no-op */ }
+#else
void cpu_svm_check_intercept_param(CPUX86State *env1, uint32_t type,
uint64_t param, uintptr_t retaddr);
+#endif
+
/* apic.c */
void cpu_report_tpr_access(CPUX86State *env, TPRAccess access);
void apic_handle_tpr_access_report(DeviceState *d, target_ulong ip,
diff --git a/target/i386/tcg/user/svm_stubs.c b/target/i386/tcg/user/svm_stubs.c
deleted file mode 100644
index db818f89a8..0000000000
--- a/target/i386/tcg/user/svm_stubs.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * x86 SVM helpers (user-mode)
- *
- * Copyright (c) 2003 Fabrice Bellard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "qemu/osdep.h"
-#include "cpu.h"
-#include "exec/helper-proto.h"
-#include "tcg/helper-tcg.h"
-
-void cpu_svm_check_intercept_param(CPUX86State *env, uint32_t type,
- uint64_t param, uintptr_t retaddr)
-{
-}
diff --git a/target/i386/tcg/user/meson.build b/target/i386/tcg/user/meson.build
index 9eac0e69ca..3555b15bdd 100644
--- a/target/i386/tcg/user/meson.build
+++ b/target/i386/tcg/user/meson.build
@@ -1,6 +1,5 @@
i386_user_ss.add(when: ['CONFIG_TCG', 'CONFIG_USER_ONLY'], if_true: files(
'excp_helper.c',
'misc_stubs.c',
- 'svm_stubs.c',
'seg_helper.c',
))
--
2.25.1
- [PATCH v2 35/50] target/i386: Simplify gen_debug usage, (continued)
- [PATCH v2 35/50] target/i386: Simplify gen_debug usage, Richard Henderson, 2021/05/14
- [PATCH v2 34/50] target/i386: Mark some helpers as noreturn, Richard Henderson, 2021/05/14
- [PATCH v2 40/50] target/i386: Pass env to do_pause and do_hlt, Richard Henderson, 2021/05/14
- [PATCH v2 41/50] target/i386: Move invlpg, hlt, monitor, mwait to sysemu, Richard Henderson, 2021/05/14
- [PATCH v2 42/50] target/i386: Unify invlpg, invlpga, Richard Henderson, 2021/05/14
- [PATCH v2 43/50] target/i386: Inline user cpu_svm_check_intercept_param,
Richard Henderson <=
- [PATCH v2 45/50] target/i386: Exit tb after wrmsr, Richard Henderson, 2021/05/14
- [PATCH v2 44/50] target/i386: Eliminate user stubs for read/write_crN, rd/wrmsr, Richard Henderson, 2021/05/14
- [PATCH v2 46/50] target/i386: Tidy gen_check_io, Richard Henderson, 2021/05/14
- [PATCH v2 48/50] target/i386: Create helper_check_io, Richard Henderson, 2021/05/14
- [PATCH v2 50/50] target/i386: Remove user-only i/o stubs, Richard Henderson, 2021/05/14