diff options
| author | Cho, Yu-Chen <acho@suse.com> | 2021-07-07 18:53:21 +0800 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2021-07-07 14:01:59 +0200 |
| commit | 1fc66ac17a604b3df78518ed9bc9bdf5552ee33a (patch) | |
| tree | d6630a37d46f9e3825c4e94c422408c3a2abd55b | |
| parent | da9448854693bb5958d181b8f67bdb7760e0d0b0 (diff) | |
| download | focaccia-qemu-1fc66ac17a604b3df78518ed9bc9bdf5552ee33a.tar.gz focaccia-qemu-1fc66ac17a604b3df78518ed9bc9bdf5552ee33a.zip | |
target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m
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> Reviewed-by: Thomas Huth <thuth@redhat.com> Message-Id: <20210707105324.23400-12-acho@suse.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | target/s390x/diag.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |