qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Cho, Yu-Chen" <acho@suse.com>
To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org
Cc: cfontana@suse.com, acho@suse.com, jose.ziviani@suse.com,
	Claudio Fontana <cfontana@suse.de>,
	Thomas Huth <thuth@redhat.com>
Subject: [PATCH v7 11/14] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m
Date: Wed,  7 Jul 2021 18:53:21 +0800	[thread overview]
Message-ID: <20210707105324.23400-12-acho@suse.com> (raw)
In-Reply-To: <20210707105324.23400-1-acho@suse.com>

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>
---
 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



  parent reply	other threads:[~2021-07-07 11:04 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-07 10:53 [PATCH v7 00/14] s390x cleanup Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 01/14] target/s390x: meson: add target_user_arch Cho, Yu-Chen
2021-07-07 11:29   ` Thomas Huth
2021-07-08 17:20   ` Cornelia Huck
2021-07-09  7:24     ` Al Cho
2021-07-09  7:43       ` Cornelia Huck
2021-07-07 10:53 ` [PATCH v7 02/14] hw/s390x: rename tod-qemu.c to tod-tcg.c Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 03/14] hw/s390x: tod: make explicit checks for accelerators when initializing Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 04/14] hw/s390x: only build tod-tcg from the CONFIG_TCG build Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 05/14] target/s390x: remove tcg-stub.c Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 06/14] target/s390x: rename internal.h to s390x-internal.h Cho, Yu-Chen
2021-07-07 11:31   ` Thomas Huth
2021-07-07 10:53 ` [PATCH v7 07/14] target/s390x: start moving TCG-only code to tcg/ Cho, Yu-Chen
2021-07-07 11:39   ` Thomas Huth
2021-07-07 10:53 ` [PATCH v7 08/14] target/s390x: move sysemu-only code out to cpu-sysemu.c Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 09/14] target/s390x: split cpu-dump from helper.c Cho, Yu-Chen
2021-07-07 11:42   ` Thomas Huth
2021-07-07 10:53 ` [PATCH v7 10/14] target/s390x: make helper.c sysemu-only Cho, Yu-Chen
2021-07-07 10:53 ` Cho, Yu-Chen [this message]
2021-07-07 10:53 ` [PATCH v7 12/14] target/s390x: remove kvm-stub.c Cho, Yu-Chen
2021-07-07 10:53 ` [PATCH v7 13/14] target/s390x: move kvm files into kvm/ Cho, Yu-Chen
2021-07-07 11:47   ` Thomas Huth
2021-07-07 10:53 ` [PATCH v7 14/14] target/s390x: split sysemu part of cpu models Cho, Yu-Chen
2021-07-07 11:56 ` [PATCH v7 00/14] s390x cleanup Cornelia Huck
2021-07-07 16:39 ` Cornelia Huck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210707105324.23400-12-acho@suse.com \
    --to=acho@suse.com \
    --cc=cfontana@suse.com \
    --cc=cfontana@suse.de \
    --cc=jose.ziviani@suse.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).