[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v5 10/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_
From: |
Cho, Yu-Chen |
Subject: |
[RFC v5 10/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m |
Date: |
Tue, 22 Jun 2021 18:17:23 +0800 |
this will allow to remove the kvm stubs.
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Cho, Yu-Chen <acho@suse.com>
---
target/s390x/diag.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/s390x/diag.c b/target/s390x/diag.c
index c17a2498a7..8405f69df0 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -20,6 +20,7 @@
#include "hw/s390x/ipl.h"
#include "hw/s390x/s390-virtio-ccw.h"
#include "hw/s390x/pv.h"
+#include "sysemu/kvm.h"
#include "kvm_s390x.h"
int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
@@ -168,7 +169,7 @@ out:
return;
}
- if (kvm_s390_get_hpage_1m()) {
+ if (kvm_enabled() && kvm_s390_get_hpage_1m()) {
error_report("Protected VMs can currently not be backed with "
"huge pages");
env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV;
--
2.32.0
- [RFC v5 03/13] hw/s390x: only build tod-tcg from the CONFIG_TCG build, (continued)
- [RFC v5 03/13] hw/s390x: only build tod-tcg from the CONFIG_TCG build, Cho, Yu-Chen, 2021/06/22
- [RFC v5 04/13] hw/s390x: tod: make explicit checks for accelerators when initializing, Cho, Yu-Chen, 2021/06/22
- [RFC v5 05/13] target/s390x: remove tcg-stub.c, Cho, Yu-Chen, 2021/06/22
- [RFC v5 06/13] target/s390x: start moving TCG-only code to tcg/, Cho, Yu-Chen, 2021/06/22
- [RFC v5 07/13] target/s390x: move sysemu-only code out to cpu-sysemu.c, Cho, Yu-Chen, 2021/06/22
- [RFC v5 08/13] target/s390x: split cpu-dump from helper.c, Cho, Yu-Chen, 2021/06/22
- [RFC v5 09/13] target/s390x: make helper.c sysemu-only, Cho, Yu-Chen, 2021/06/22
- [RFC v5 10/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m,
Cho, Yu-Chen <=
- [RFC v5 11/13] target/s390x: remove kvm-stub.c, Cho, Yu-Chen, 2021/06/22
- [RFC v5 12/13] target/s390x: move kvm files into kvm/, Cho, Yu-Chen, 2021/06/22
- [RFC v5 13/13] target/s390x: split sysemu part of cpu models, Cho, Yu-Chen, 2021/06/22
- Re: [RFC v5 00/13] s390x cleanup, Al Cho, 2021/06/22