QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Claudio Fontana <cfontana@suse.de>
To: Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>,
	Richard Henderson <richard.henderson@linaro.org>
Cc: David Hildenbrand <david@redhat.com>,
	qemu-devel@nongnu.org, Halil Pasic <pasic@linux.ibm.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	qemu-s390x@nongnu.org, Claudio Fontana <cfontana@suse.de>,
	Paolo Bonzini <pbonzini@redhat.com>
Subject: [RFC v2 09/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m
Date: Tue, 20 Apr 2021 12:36:12 +0200
Message-ID: <20210420103616.32731-10-cfontana@suse.de> (raw)
In-Reply-To: <20210420103616.32731-1-cfontana@suse.de>

this will allow to remove the kvm stubs.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
---
 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 86b7032b5b..311e22b4ea 100644
--- a/target/s390x/diag.c
+++ b/target/s390x/diag.c
@@ -21,6 +21,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)
@@ -169,7 +170,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.26.2



  parent reply index

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-20 10:36 [RFC v2 00/13] s390x cleanup Claudio Fontana
2021-04-20 10:36 ` [RFC v2 01/13] hw/s390x: only build tod-qemu from the CONFIG_TCG build Claudio Fontana
2021-04-20 12:50   ` David Hildenbrand
2021-04-20 10:36 ` [RFC v2 02/13] hw/s390x: rename tod-qemu.c to tod-tcg.c Claudio Fontana
2021-04-20 12:49   ` David Hildenbrand
2021-04-20 10:36 ` [RFC v2 03/13] hw/s390x: tod: make explicit checks for accelerators when initializing Claudio Fontana
2021-04-20 12:52   ` David Hildenbrand
2021-04-20 10:36 ` [RFC v2 04/13] target/s390x: remove tcg-stub.c Claudio Fontana
2021-04-20 12:54   ` David Hildenbrand
2021-04-20 13:00     ` Claudio Fontana
2021-04-20 13:04       ` David Hildenbrand
2021-04-20 13:35         ` Claudio Fontana
2021-04-20 13:06   ` David Hildenbrand
2021-04-20 10:36 ` [RFC v2 05/13] target/s390x: start moving TCG-only code to tcg/ Claudio Fontana
2021-04-20 13:16   ` David Hildenbrand
2021-04-20 13:40     ` Claudio Fontana
2021-04-20 10:36 ` [RFC v2 06/13] target/s390x: move sysemu-only code out to cpu-sysemu.c Claudio Fontana
2021-04-20 10:36 ` [RFC v2 07/13] target/s390x: split cpu-dump from helper.c Claudio Fontana
2021-04-20 10:36 ` [RFC v2 08/13] target/s390x: make helper.c sysemu-only Claudio Fontana
2021-04-20 10:36 ` Claudio Fontana [this message]
2021-04-20 10:36 ` [RFC v2 10/13] target/s390x: remove kvm-stub.c Claudio Fontana
2021-04-20 10:36 ` [RFC v2 11/13] target/s390x: move kvm files into kvm/ Claudio Fontana
2021-04-20 10:36 ` [RFC v2 12/13] target/s390x: split sysemu part of cpu models Claudio Fontana
2021-04-20 10:36 ` [RFC v2 13/13] MAINTAINERS: update s390x directories Claudio Fontana

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=20210420103616.32731-10-cfontana@suse.de \
    --to=cfontana@suse.de \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=pasic@linux.ibm.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=richard.henderson@linaro.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

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git
	git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org
	public-inbox-index qemu-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git