From 5e7164c50c9f6ac531a0e3c7a49b3771ddefb8f3 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Fri, 18 Aug 2017 13:43:51 +0200 Subject: s390x: avoid calling kvm_ functions outside of target/s390x/ Let's just introduce an helper. Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: David Hildenbrand Message-Id: <20170818114353.13455-17-david@redhat.com> Signed-off-by: Cornelia Huck --- target/s390x/cpu.c | 7 +++++++ target/s390x/cpu.h | 1 + 2 files changed, 8 insertions(+) (limited to 'target') diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 90e2db7b1f..c538a95850 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -471,6 +471,13 @@ bool s390_get_squash_mcss(void) return false; } + +void s390_enable_css_support(S390CPU *cpu) +{ + if (kvm_enabled()) { + kvm_s390_enable_css_support(cpu); + } +} #endif static gchar *s390_gdb_arch_name(CPUState *cs) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index a2cefb7a0c..77b29774cc 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -404,6 +404,7 @@ int cpu_s390x_signal_handler(int host_signum, void *pinfo, #ifndef CONFIG_USER_ONLY +void s390_enable_css_support(S390CPU *cpu); int s390_virtio_hypercall(CPUS390XState *env); #ifdef CONFIG_KVM -- cgit v1.2.3-55-g7522