[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH RFC 3/5] s390x: avoid calling kvm_ functions outside
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH RFC 3/5] s390x: avoid calling kvm_ functions outside of target/s390x/ |
Date: |
Fri, 11 Aug 2017 09:46:50 +0200 |
Let's just introduce an helper.
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 4 +---
target/s390x/cpu.c | 6 ++++++
target/s390x/cpu.h | 1 +
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 1c7af39..ac087ab 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -142,9 +142,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 81165e8..c834bfb 100644
--- a/target/s390x/cpu.c
+++ b/target/s390x/cpu.c
@@ -472,6 +472,12 @@ 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 a9acef6..87dea80 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
--
2.9.4
- [Qemu-devel] [PATCH RFC 1/5] target/s390x: introduce internal.h, (continued)
Re: [Qemu-devel] [PATCH RFC 1/5] target/s390x: introduce internal.h, Thomas Huth, 2017/08/11
[Qemu-devel] [PATCH RFC 3/5] s390x: avoid calling kvm_ functions outside of target/s390x/,
David Hildenbrand <=
[Qemu-devel] [PATCH RFC 4/5] target/s390x: remove all CONFIG_KVM from cpu.h, David Hildenbrand, 2017/08/11
[Qemu-devel] [PATCH RFC 5/5] target/s390x: cleanup cpu.h, David Hildenbrand, 2017/08/11