[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.5 06/15] s390x/kvm: don't enable CMMA when huge
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL for-2.5 06/15] s390x/kvm: don't enable CMMA when hugetlbfs will be used |
Date: |
Wed, 11 Nov 2015 18:56:24 +0100 |
From: Dominik Dingel <address@hidden>
On hugetlbfs CMMA will not be useful as every ESSA instruction will trap.
So don't offer CMMA to guests with a hugepages backing.
Signed-off-by: Dominik Dingel <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
target-s390x/kvm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index c3be180..75a0e5d 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -258,7 +258,9 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
cap_mem_op = kvm_check_extension(s, KVM_CAP_S390_MEM_OP);
cap_s390_irq = kvm_check_extension(s, KVM_CAP_S390_INJECT_IRQ);
- kvm_s390_enable_cmma(s);
+ if (!mem_path) {
+ kvm_s390_enable_cmma(s);
+ }
if (!kvm_check_extension(s, KVM_CAP_S390_GMAP)
|| !kvm_check_extension(s, KVM_CAP_S390_COW)) {
--
2.6.3
- [Qemu-devel] [PULL for-2.5 00/15] s390x patches for 2.5, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 01/15] s390x/css: sense data endianness, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 04/15] MAINTAINERS: update virtio-ccw/s390 git tree, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 02/15] s390x/pci : fix up s390 pci iommu translation function, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 06/15] s390x/kvm: don't enable CMMA when hugetlbfs will be used,
Cornelia Huck <=
- [Qemu-devel] [PULL for-2.5 03/15] MAINTAINERS: update s390 file patterns, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 05/15] s390x: switch to memory_region_allocate_system_memory, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 08/15] pc-bios/s390-ccw: ISO-9660 El Torito boot implementation, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 07/15] pc-bios/s390-ccw: Always adjust virtio sector count, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 10/15] pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 09/15] pc-bios/s390-ccw: El Torito s390x boot entry check, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 14/15] s390x/ipl: switch error reporting to error_setg, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 13/15] s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE, Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 12/15] qdev: provide qdev_reset_all_fn(), Cornelia Huck, 2015/11/11
- [Qemu-devel] [PULL for-2.5 11/15] pc-bios/s390-ccw: rebuild image, Cornelia Huck, 2015/11/11