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>
This commit is contained in:
parent
b6089b059c
commit
5e7164c50c
|
@ -144,9 +144,7 @@ static void ccw_init(MachineState *machine)
|
||||||
/* register hypercalls */
|
/* register hypercalls */
|
||||||
virtio_ccw_register_hcalls();
|
virtio_ccw_register_hcalls();
|
||||||
|
|
||||||
if (kvm_enabled()) {
|
s390_enable_css_support(s390_cpu_addr2state(0));
|
||||||
kvm_s390_enable_css_support(s390_cpu_addr2state(0));
|
|
||||||
}
|
|
||||||
/*
|
/*
|
||||||
* Non mcss-e enabled guests only see the devices from the default
|
* Non mcss-e enabled guests only see the devices from the default
|
||||||
* css, which is determined by the value of the squash_mcss property.
|
* css, which is determined by the value of the squash_mcss property.
|
||||||
|
|
|
@ -471,6 +471,13 @@ bool s390_get_squash_mcss(void)
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void s390_enable_css_support(S390CPU *cpu)
|
||||||
|
{
|
||||||
|
if (kvm_enabled()) {
|
||||||
|
kvm_s390_enable_css_support(cpu);
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static gchar *s390_gdb_arch_name(CPUState *cs)
|
static gchar *s390_gdb_arch_name(CPUState *cs)
|
||||||
|
|
|
@ -404,6 +404,7 @@ int cpu_s390x_signal_handler(int host_signum, void *pinfo,
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
|
||||||
|
void s390_enable_css_support(S390CPU *cpu);
|
||||||
int s390_virtio_hypercall(CPUS390XState *env);
|
int s390_virtio_hypercall(CPUS390XState *env);
|
||||||
|
|
||||||
#ifdef CONFIG_KVM
|
#ifdef CONFIG_KVM
|
||||||
|
|
Loading…
Reference in a new issue