diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2019-02-11 12:32:55 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-02-18 11:25:43 +0100 |
| commit | 09ced81aac76e1adfa0d4b9868f7dc4b38e66f19 (patch) | |
| tree | 948702f3c175e5e0f9a5e89eedd68042a1e31657 /target | |
| parent | 44699e1c94bad41bbeb0c96f9ed344eb8e325413 (diff) | |
s390x: always provide pci support
We tried to make pci support optional on s390x in the past;
unfortunately, we still require the s390 phb to be created
unconditionally due to backwards compatibility issues.
Instead of sinking more effort into this (including compat
handling for older machines etc.) for non-obvious gains, let's
just make CONFIG_PCI something that is always set on s390x.
Note that you can still fence off pci for the _guest_ if you
provide a cpu model without the zpci feature.
Message-Id: <20190211113255.3837-1-cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/s390x/cpu_models.c | 5 | ||||
| -rw-r--r-- | target/s390x/gen-features.c | 1 | ||||
| -rw-r--r-- | target/s390x/kvm.c | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c index 7c253ff308..249011fd62 100644 --- a/target/s390x/cpu_models.c +++ b/target/s390x/cpu_models.c @@ -1314,11 +1314,6 @@ static void register_types(void) /* init all bitmaps from gnerated data initially */ s390_init_feat_bitmap(qemu_max_cpu_feat_init, qemu_max_cpu_feat); -#ifndef CONFIG_USER_ONLY - if (!pci_available) { - clear_bit(S390_FEAT_ZPCI, qemu_max_cpu_feat); - } -#endif for (i = 0; i < ARRAY_SIZE(s390_cpu_defs); i++) { s390_init_feat_bitmap(s390_cpu_defs[i].base_init, s390_cpu_defs[i].base_feat); diff --git a/target/s390x/gen-features.c b/target/s390x/gen-features.c index 70015eaaf5..b0e9b271e2 100644 --- a/target/s390x/gen-features.c +++ b/target/s390x/gen-features.c @@ -598,7 +598,6 @@ 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, }; diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 9ff80c8461..15fdc168e1 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -2278,9 +2278,7 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, Error **errp) } /* We emulate a zPCI bus and AEN, therefore we don't need HW support */ - if (pci_available) { - set_bit(S390_FEAT_ZPCI, model->features); - } + set_bit(S390_FEAT_ZPCI, model->features); set_bit(S390_FEAT_ADAPTER_EVENT_NOTIFICATION, model->features); if (s390_known_cpu_type(cpu_type)) { |