[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH RFC v2 3/9] s390x: chsc nt2 events are pci-only
From: |
Thomas Huth |
Subject: |
Re: [Qemu-devel] [PATCH RFC v2 3/9] s390x: chsc nt2 events are pci-only |
Date: |
Wed, 19 Jul 2017 09:57:47 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.0 |
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.
>
> Signed-off-by: Cornelia Huck <address@hidden>
> ---
> 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/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;
> }
>
> -int chsc_sei_nt2_get_event(void *res)
> +int pci_chsc_sei_nt2_get_event(void *res)
> {
> ChscSeiNt2Res *nt2_res = (ChscSeiNt2Res *)res;
> PciCcdfAvail *accdf;
> @@ -87,7 +87,7 @@ int chsc_sei_nt2_get_event(void *res)
> return rc;
> }
>
> -int chsc_sei_nt2_have_event(void)
> +int pci_chsc_sei_nt2_have_event(void)
> {
> S390pciState *s = s390_get_phb();
>
> 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;
>
> 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"
>
> /* target/s390x/ioinst.c */
> -int chsc_sei_nt2_get_event(void *res)
> +int pci_chsc_sei_nt2_get_event(void *res)
> {
> return 1;
> }
>
> -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;
> }
>
> +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 = s390_get_phb();
if (s390_has_feat(S390_FEAT_ZPCI) && ps != NULL) {
return ps->pci_chsc_sei_nt2_have_event();
}
return 0;
}
and you would not need the stubs in pci-stubs.c anymore?
Thomas
- [Qemu-devel] [PATCH RFC v2 0/9] s390x: zPCI detangling, Cornelia Huck, 2017/07/18
- [Qemu-devel] [PATCH RFC v2 2/9] s390x/pci: add stubs, Cornelia Huck, 2017/07/18
- [Qemu-devel] [PATCH RFC v2 3/9] s390x: chsc nt2 events are pci-only, Cornelia Huck, 2017/07/18
- Re: [Qemu-devel] [PATCH RFC v2 3/9] s390x: chsc nt2 events are pci-only,
Thomas Huth <=
- [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds, Cornelia Huck, 2017/07/18
- Re: [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds, Christian Borntraeger, 2017/07/18
- Re: [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds, Cornelia Huck, 2017/07/19
- Re: [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds, Yi Min Zhao, 2017/07/19
- Re: [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds, Cornelia Huck, 2017/07/19
- Re: [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds, Yi Min Zhao, 2017/07/19
- Re: [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds, Yi Min Zhao, 2017/07/19
Re: [Qemu-devel] [PATCH RFC v2 4/9] s390x/pci: do not advertise pci on non-pci builds, Thomas Huth, 2017/07/19