Skip to content

Commit

Permalink
Merge remote-tracking branch 'kvms390/s390forkvm' into kvms390next
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Borntraeger committed Sep 8, 2016
2 parents 0624a8e + f6c1d35 commit b0eb91a
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 4 deletions.
24 changes: 24 additions & 0 deletions arch/s390/include/asm/facilities_src.h
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,28 @@ static struct facility_def facility_defs[] = {
-1 /* END */
}
},
{
.name = "FACILITIES_KVM",
.bits = (int[]){
0, /* N3 instructions */
1, /* z/Arch mode installed */
2, /* z/Arch mode active */
3, /* DAT-enhancement */
4, /* idte segment table */
5, /* idte region table */
6, /* ASN-and-LX reuse */
7, /* stfle */
8, /* enhanced-DAT 1 */
9, /* sense-running-status */
10, /* conditional sske */
13, /* ipte-range */
14, /* nonquiescing key-setting */
73, /* transactional execution */
75, /* access-exception-fetch/store indication */
76, /* msa extension 3 */
77, /* msa extension 4 */
78, /* enhanced-DAT 2 */
-1 /* END */
}
},
};
5 changes: 1 addition & 4 deletions arch/s390/kvm/kvm-s390.c
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,7 @@ module_param(nested, int, S_IRUGO);
MODULE_PARM_DESC(nested, "Nested virtualization support");

/* upper facilities limit for kvm */
unsigned long kvm_s390_fac_list_mask[16] = {
0xffe6000000000000UL,
0x005e000000000000UL,
};
unsigned long kvm_s390_fac_list_mask[16] = { FACILITIES_KVM };

unsigned long kvm_s390_fac_list_mask_size(void)
{
Expand Down

0 comments on commit b0eb91a

Please sign in to comment.