Re: [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds

[Christian Borntraeger]

On 07/18/2017 04:24 PM, Cornelia Huck wrote:
> Only set the zpci and aen feature bits on builds that actually
> support pci.
> 
> Signed-off-by: Cornelia Huck <address@hidden>
> ---
>  target/s390x/kvm.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
> index 831492f9a2..880eccd58a 100644
> --- a/target/s390x/kvm.c
> +++ b/target/s390x/kvm.c
> @@ -2685,8 +2685,10 @@ void kvm_s390_get_host_cpu_model(S390CPUModel *model, 
> Error **errp)
>      }
> 
>      /* set zpci and aen facilities */
> +#ifdef CONFIG_PCI
>      set_bit(S390_FEAT_ZPCI, model->features);
>      set_bit(S390_FEAT_ADAPTER_EVENT_NOTIFICATION, model->features);
> +#endif
> 
>      if (s390_known_cpu_type(cpu_type)) {
>          /* we want the exact model, even if some features are missing */
> 

Not strictly necessary but do you also want to ifdef this

 kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0);

call?

If not you could actually even allow AEN but not PCI for !CONFIG_PCI.