diff options
author | Cornelia Huck <cohuck@redhat.com> | 2017-11-23 16:59:11 +0100 |
---|---|---|
committer | Cornelia Huck <cohuck@redhat.com> | 2018-02-09 09:37:13 +0100 |
commit | e3fd586dfa9e4904c634dcfbcd8371af3df18556 (patch) | |
tree | 440f5f96a7c3e97679ccfee1d0c29c1dc7fda009 /target/s390x/gen-features.c | |
parent | f6c232ce1605f7719ed6f769c8609099d8cdff48 (diff) |
s390x/cpumodel: allow zpci features in qemu model
AEN and AIS can be provided unconditionally, ZPCI should be turned on
manually.
With -cpu qemu,zpci=on, the guest kernel can now successfully detect
virtio-pci devices under tcg.
Also fixup the order of the MSA_EXT_{3,4} flags while at it.
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target/s390x/gen-features.c')
-rw-r--r-- | target/s390x/gen-features.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 0570f597ec..89a140c9a7 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -572,8 +572,10 @@ static uint16_t qemu_LATEST[] = { S390_FEAT_STFLE_49, S390_FEAT_LOCAL_TLB_CLEARING, S390_FEAT_INTERLOCKED_ACCESS_2, - S390_FEAT_MSA_EXT_4, + S390_FEAT_ADAPTER_EVENT_NOTIFICATION, + S390_FEAT_ADAPTER_INT_SUPPRESSION, S390_FEAT_MSA_EXT_3, + S390_FEAT_MSA_EXT_4, }; /* add all new definitions before this point */ @@ -582,6 +584,8 @@ static uint16_t qemu_MAX[] = { S390_FEAT_STFLE_53, /* generates a dependency warning, leave it out for now */ S390_FEAT_MSA_EXT_5, + /* only with CONFIG_PCI */ + S390_FEAT_ZPCI, }; /****** END FEATURE DEFS ******/ |