On 09/15/2017 03:37 PM, David Hildenbrand wrote: > On 15.09.2017 15:22, Cornelia Huck wrote: >> On Fri, 15 Sep 2017 15:09:02 +0200 >> David Hildenbrand <da...@redhat.com> wrote: >> >>> On 15.09.2017 15:07, Cornelia Huck wrote: >>>> On Fri, 15 Sep 2017 13:57:40 +0200 >>>> David Hildenbrand <da...@redhat.com> wrote: >>>> >>>>> As an alternative, simply >>>>> >>>>> diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c >>>>> index 0f28ebd162..0f22efc3b6 100644 >>>>> --- a/target/s390x/cpu_models.c >>>>> +++ b/target/s390x/cpu_models.c >>>>> @@ -195,6 +195,8 @@ bool s390_has_feat(S390Feat feat) >>>>> return true; >>>>> } >>>>> } >>>>> + if (feat == S390_FEAT_ZPCI) >>>>> + return true; >>>> >>>> Move that out of the CONFIG_KVM #ifdef? >>>> >>> >>> Should not make a difference I think, cpu models are not shielded off >>> for TCG I think (maybe we should fix that, but doesn't look that easy - >>> they have no host model which would allow cpu->model = NULL). >> >> It just looks odd to have it inside the define... > > sure, you can then also just move it into kvm_enable() next to the other > ones. > >> >>> >>>> (Also, we still have the issue with pci support :/ - depend on >>>> pci_available?) >>> >>> hm .... >> >> Should we maybe disallow compat machines if CONFIG_PCI is off, and >> think about something for the 2.11 machine? Otherwise, I cannot see >> that end well :/ > > If they required PCI, than that is the only way to do it. > >> >> But I'll just draw up a v2 for now. >>
Sorry for not contributing anything here. I don't have the whole thing in my head, so I can't quite follow without digging into this. I don't think I will be able to join today -- maybe I could have a look next week . Halil > >