[PATCH] KVM: s390: Fix for kvm/master (target 4.1)

[PATCH] KVM: s390: Fix for kvm/master (target 4.1)

[Christian Borntraeger]

Paolo,

here is a small fix for a regression that came in during the
merge window. If affects only guests older than 3.12 when
running on z196 or newer and transparent huge pages are used
in the guest.

As it is only one patch I prepared no signed tag - let me
know if you prefer to have one.

Christian

[PATCH] KVM: s390: disable RRBM again

[Christian Borntraeger]

commit b273921356df ("KVM: s390: enable more features that need
no hypervisor changes") also enabled RRBM. Turns out that this
instruction does need some KVM code, so lets disable that bit
again.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Fixes: b273921356df ("KVM: s390: enable more features that need no hypervisor changes") 

---
 arch/s390/kvm/kvm-s390.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 3040b14..98ba0fc 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -110,7 +110,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 /* upper facilities limit for kvm */
 unsigned long kvm_s390_fac_list_mask[] = {
 	0xffe6fffbfcfdfc40UL,
-	0x205c800000000000UL,
+	0x005c800000000000UL,
 };
 
 unsigned long kvm_s390_fac_list_mask_size(void)
-- 
2.3.0

Re: [PATCH] KVM: s390: Fix for kvm/master (target 4.1)

[Paolo Bonzini]

On 15/04/2015 12:27, Christian Borntraeger wrote:
> Paolo,
> 
> here is a small fix for a regression that came in during the
> merge window. If affects only guests older than 3.12 when
> running on z196 or newer and transparent huge pages are used
> in the guest.
> 
> As it is only one patch I prepared no signed tag - let me
> know if you prefer to have one.

Thanks, it's okay.

Paolo