diff options
| author | David Hildenbrand <david@redhat.com> | 2017-08-18 13:43:51 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2017-08-30 18:23:25 +0200 |
| commit | 5e7164c50c9f6ac531a0e3c7a49b3771ddefb8f3 (patch) | |
| tree | 1d20e6d48e59ce7d72439f939fb595d74e813a84 | |
| parent | b6089b059c111ae4c083a5f6d1b6038ec7c92b47 (diff) | |
s390x: avoid calling kvm_ functions outside of target/s390x/
Let's just introduce an helper.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20170818114353.13455-17-david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
| -rw-r--r-- | hw/s390x/s390-virtio-ccw.c | 4 | ||||
| -rw-r--r-- | target/s390x/cpu.c | 7 | ||||
| -rw-r--r-- | target/s390x/cpu.h | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index 42f0edac36..dd504dd5ae 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -144,9 +144,7 @@ static void ccw_init(MachineState *machine) /* register hypercalls */ virtio_ccw_register_hcalls(); - if (kvm_enabled()) { - kvm_s390_enable_css_support(s390_cpu_addr2state(0)); - } + s390_enable_css_support(s390_cpu_addr2state(0)); /* * Non mcss-e enabled guests only see the devices from the default * css, which is determined by the value of the squash_mcss property. 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 |