From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXjrr-0002u9-LC for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:58:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXjrn-0006AZ-OB for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:57:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57314) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dXjrn-0006A5-F3 for qemu-devel@nongnu.org; Wed, 19 Jul 2017 03:57:55 -0400 References: <20170718142455.32676-1-cohuck@redhat.com> <20170718142455.32676-4-cohuck@redhat.com> From: Thomas Huth Message-ID: <9e70ce06-7d67-e808-cbb9-5877bf852ac7@redhat.com> Date: Wed, 19 Jul 2017 09:57:47 +0200 MIME-Version: 1.0 In-Reply-To: <20170718142455.32676-4-cohuck@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH RFC v2 3/9] s390x: chsc nt2 events are pci-only List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck , qemu-devel@nongnu.org Cc: borntraeger@de.ibm.com, agraf@suse.de, pmorel@linux.vnet.ibm.com, zyimin@linux.vnet.ibm.com On 18.07.2017 16:24, Cornelia Huck wrote: > The nt2 event class is pci-only - don't look for events if pci is > not in the active cpu model. >=20 > Signed-off-by: Cornelia Huck > --- > 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(-) >=20 > diff --git a/hw/s390x/s390-pci-bus.c b/hw/s390x/s390-pci-bus.c > index 61cfd2138f..c57f6ebae0 100644 > --- a/hw/s390x/s390-pci-bus.c > +++ b/hw/s390x/s390-pci-bus.c > @@ -47,7 +47,7 @@ S390pciState *s390_get_phb(void) > return phb; > } > =20 > -int chsc_sei_nt2_get_event(void *res) > +int pci_chsc_sei_nt2_get_event(void *res) > { > ChscSeiNt2Res *nt2_res =3D (ChscSeiNt2Res *)res; > PciCcdfAvail *accdf; > @@ -87,7 +87,7 @@ int chsc_sei_nt2_get_event(void *res) > return rc; > } > =20 > -int chsc_sei_nt2_have_event(void) > +int pci_chsc_sei_nt2_have_event(void) > { > S390pciState *s =3D s390_get_phb(); > =20 > diff --git a/hw/s390x/s390-pci-bus.h b/hw/s390x/s390-pci-bus.h > index 67af2c12ff..5df6292509 100644 > --- a/hw/s390x/s390-pci-bus.h > +++ b/hw/s390x/s390-pci-bus.h > @@ -319,8 +319,8 @@ typedef struct S390pciState { > } S390pciState; > =20 > S390pciState *s390_get_phb(void); > -int chsc_sei_nt2_get_event(void *res); > -int chsc_sei_nt2_have_event(void); > +int pci_chsc_sei_nt2_get_event(void *res); > +int pci_chsc_sei_nt2_have_event(void); > void s390_pci_sclp_configure(SCCB *sccb); > void s390_pci_sclp_deconfigure(SCCB *sccb); > void s390_pci_iommu_enable(S390PCIIOMMU *iommu); > diff --git a/hw/s390x/s390-pci-stub.c b/hw/s390x/s390-pci-stub.c > index 2e7e42a2af..cc7278a865 100644 > --- a/hw/s390x/s390-pci-stub.c > +++ b/hw/s390x/s390-pci-stub.c > @@ -7,12 +7,12 @@ > #include "s390-pci-bus.h" > =20 > /* target/s390x/ioinst.c */ > -int chsc_sei_nt2_get_event(void *res) > +int pci_chsc_sei_nt2_get_event(void *res) > { > return 1; > } > =20 > -int chsc_sei_nt2_have_event(void) > +int pci_chsc_sei_nt2_have_event(void) > { > return 0; > } > diff --git a/target/s390x/ioinst.c b/target/s390x/ioinst.c > index d5e6b8066b..a9e5b13292 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; > } > =20 > +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; > +} Hmm, since you're having wrapper functions for these now anyway, I wonder whether it would be more elegant to make pci_chsc_sei_nt2_get_event() and pci_chsc_sei_nt2_have_event() function pointers in the S390pciState object instead. Then you could do something like: static int chsc_sei_nt2_have_event(void) { S390pciState *ps =3D s390_get_phb(); if (s390_has_feat(S390_FEAT_ZPCI) && ps !=3D NULL) { return ps->pci_chsc_sei_nt2_have_event(); } return 0; } and you would not need the stubs in pci-stubs.c anymore? Thomas