Re: [Qemu-devel] [PATCH/s390-next 2/3] s390x/cpumodel: add zpci, aen and ais facilities

[Cornelia Huck <cohuck@redhat.com>]

On Thu, 13 Jul 2017 14:41:05 +0200
Christian Borntraeger <borntraeger@de.ibm.com> wrote:

> On 07/13/2017 02:11 PM, Cornelia Huck wrote:
> > On Thu, 13 Jul 2017 12:40:28 +0200
> > Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> >   
> >> From: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
> >>
> >> zPCI instructions and facilities are available since IBM zEnterprise
> >> EC12. To support z/PCI in QEMU we enable zpci, aen and ais facilities
> >> starting with zEC12 GA1. And we always set zpci and aen bits in max cpu
> >> model. Later they might be switched off due to applied real cpu model.
> >> For ais bit, we only provide it in the full cpu model beginning with
> >> zEC12 and defer its enablement in the default cpu model to a later point
> >> in time. At the same time, disable them for 2.9 and older machines.
> >>
> >> Because of introducing AIS facility, we could check if it's enabled to
> >> initialize flic->ais_supported with the real value.
> >>
> >> Signed-off-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
> >> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
> >> ---
> >>  hw/intc/s390_flic.c             | 3 ++-
> >>  hw/intc/s390_flic_kvm.c         | 3 ---
> >>  hw/s390x/s390-virtio-ccw.c      | 3 +++
> >>  target/s390x/cpu_features.c     | 3 +++
> >>  target/s390x/cpu_features_def.h | 3 +++
> >>  target/s390x/gen-features.c     | 5 +++++
> >>  target/s390x/kvm.c              | 7 +++++++
> >>  7 files changed, 23 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
> >> index ff6e4ec..6e7c610 100644
> >> --- a/hw/intc/s390_flic.c
> >> +++ b/hw/intc/s390_flic.c
> >> @@ -163,9 +163,10 @@ static void s390_flic_common_realize(DeviceState *dev, Error **errp)
> >>      if (max_batch > ADAPTER_ROUTES_MAX_GSI) {
> >>          error_setg(errp, "flic property adapter_routes_max_batch too big"
> >>                     " (%d > %d)", max_batch, ADAPTER_ROUTES_MAX_GSI);
> >> +        return;  
> > 
> > Hunk should go into a previous patch?
> > 
> > (And does it really matter?)  
> 
> I can
> - move to the previous series patch 8 (s390x/flic: introduce modify_ais_mode callback)
> - remove the return as it does not matter (this is realize, and realize failures here
> are fatal as far as I can tell)
> - keep it here since this version was tested and it does not hurt
> 

I'd say 2 or 3, no need to juggle existing patches for what is
basically a non-issue.