On Wed, 19 Jul 2017 13:41:04 +0200 Thomas Huth <th...@redhat.com> wrote:
> On 18.07.2017 16:24, Cornelia Huck wrote: > > Only set the zpci and aen feature bits on builds that actually > > support pci. > > > > Signed-off-by: Cornelia Huck <coh...@redhat.com> > > --- > > 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 */ > > Have you tried whether this actually still works right in builds where > CONFIG_PCI is enabled? I'm afraid, but I think the #ifdef does not work > here, since CONFIG_PCI is a Makefile-only setting, and it does not get > set in config-target.h at all... Of course it does not. Sigh. I think I'll just move this into a helper function in the zpci code resp. the zpci stub.