On Wed, 26 Jul 2017 08:59:10 +0200 Thomas Huth <th...@redhat.com> wrote:
> On 25.07.2017 17:33, Cornelia Huck wrote: > > The nt2 event class is pci-only - don't look for events if pci is > > not in the active cpu model. > > > > Signed-off-by: Cornelia Huck <coh...@redhat.com> > > --- > > hw/s390x/s390-pci-bus.c | 4 ++-- > > hw/s390x/s390-pci-bus.h | 4 ++-- > > hw/s390x/s390-pci-stub.c | 4 ++-- > > target/s390x/ioinst.c | 16 ++++++++++++++++ > > 4 files changed, 22 insertions(+), 6 deletions(-) > > diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c > > index 51fbea620d..3fa3301f50 100644 > > --- a/target/s390x/ioinst.c > > +++ b/target/s390x/ioinst.c > > @@ -599,6 +599,22 @@ static int chsc_sei_nt0_have_event(void) > > return 0; > > } > > > > +static int chsc_sei_nt2_get_event(void *res) > > +{ > > + if (s390_has_feat(S390_FEAT_ZPCI)) { > > + return pci_chsc_sei_nt2_get_event(res); > > + } > > + return 1; > > +} > > + > > +static int chsc_sei_nt2_have_event(void) > > +{ > > + if (s390_has_feat(S390_FEAT_ZPCI)) { > > + return pci_chsc_sei_nt2_have_event(); > > + } > > + return 0; > > +} > > Not sure whether it is nicer/better, but you could also do the check > only once in ioinst_handle_chsc_sei() and then get along without these > wrapper functions? I prefer the wrapper functions, as it mirrors the nt0 wrappers and nicely contains the fact that nt2 is pci specific.