From 09ced81aac76e1adfa0d4b9868f7dc4b38e66f19 Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Mon, 11 Feb 2019 12:32:55 +0100 Subject: 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 Reviewed-by: David Hildenbrand Acked-by: Christian Borntraeger Signed-off-by: Cornelia Huck --- target/s390x/gen-features.c | 1 - 1 file changed, 1 deletion(-) (limited to 'target/s390x/gen-features.c') 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, }; -- cgit v1.2.3