[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 38/44] s390x: avoid calling kvm_ functions outside of
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 38/44] s390x: avoid calling kvm_ functions outside of target/s390x/ |
Date: |
Wed, 30 Aug 2017 18:52:46 +0200 |
From: David Hildenbrand <address@hidden>
Let's just introduce an helper.
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 4 +---
target/s390x/cpu.c | 7 +++++++
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
--
2.13.5
- [Qemu-devel] [PULL 27/44] target/s390x: no need to pass kvm_state to savevm_gtod handlers, (continued)
- [Qemu-devel] [PULL 27/44] target/s390x: no need to pass kvm_state to savevm_gtod handlers, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 28/44] s390x/cpumodel: factor out determination of default model name, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 29/44] s390x: drop inclusion of sysemu/kvm.h from some files, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 30/44] target/s390x: move gtod_*() declarations to s390-virtio.h, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 32/44] target/s390x: move cpu_mmu_idx_to_asc() to excp_helper.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 31/44] target/s390x: move cc_name() to helper.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 33/44] target/s390x: move psw_key_valid() to mem_helper.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 34/44] target/s390x: move s390_do_cpu_reset() to diag.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 35/44] target/s390x: move get_per_in_range() to misc_helper.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 36/44] target/s390x: introduce internal.h, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 38/44] s390x: avoid calling kvm_ functions outside of target/s390x/,
Cornelia Huck <=
- [Qemu-devel] [PULL 37/44] target/s390x: move a couple of functions to cpu.c, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 39/44] s390x/kvm: move KVM declarations and stubs to separate files, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 41/44] s390x/s390-stattrib: Mark the storage attribute as not user_creatable, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 42/44] s390-ccw: Fix alignment for CCW1, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 40/44] target/s390x: cleanup cpu.h, Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 44/44] s390x/pci: fixup trap_msix(), Cornelia Huck, 2017/08/30
- [Qemu-devel] [PULL 43/44] pc-bios/s390-ccw.img: update image, Cornelia Huck, 2017/08/30
- Re: [Qemu-devel] [PULL 00/44] first batch of s390x patches for 2.11, Peter Maydell, 2017/08/31