[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-2.11 04/18] target/s390x: simplify gs_allowed
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v3 for-2.11 04/18] target/s390x: simplify gs_allowed() |
Date: |
Fri, 18 Aug 2017 13:43:39 +0200 |
No need for kvm_enabled() as this function is only called from KVM and
there is no reason why it shouldn't be allowed for tcg. It is simply not
available under tcg.
Also, there is no need to check for the machine type anymore. Just like
ri_enabled(), we can directly use the stored flag, which results in
"true" for the "none" machine.
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 3a674f5..3e9b455 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -288,18 +288,8 @@ bool cpu_model_allowed(void)
bool gs_allowed(void)
{
- if (kvm_enabled()) {
- MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
- if (object_class_dynamic_cast(OBJECT_CLASS(mc),
- TYPE_S390_CCW_MACHINE)) {
- S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc);
-
- return s390mc->gs_allowed;
- }
- /* Make sure the "none" machine can have gs */
- return true;
- }
- return false;
+ /* for "none" machine this results in true */
+ return get_machine_class()->gs_allowed;
}
static char *machine_get_loadparm(Object *obj, Error **errp)
--
2.9.4
- [Qemu-devel] [PATCH v3 for-2.11 00/18] target/s390x: cleanup cpu.h, David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 01/18] s390x/kvm: drop KVMState parameter from s390_get_memslot_count(), David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 02/18] s390x/kvm: drop KVMState parameter from kvm_s390_set_mem_limit(), David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 03/18] target/s390x: simplify ri_allowed(), David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 04/18] target/s390x: simplify gs_allowed(),
David Hildenbrand <=
- [Qemu-devel] [PATCH v3 for-2.11 05/18] target/s390x: no need to pass kvm_state to savevm_gtod handlers, David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 06/18] s390x/cpumodel: factor out determination of default model name, David Hildenbrand, 2017/08/18
- [Qemu-devel] [PATCH v3 for-2.11 07/18] s390x: drop inclusion of sysemu/kvm.h from some files, David Hildenbrand, 2017/08/18