[v1] first s390x update for 5.0

[PULL 00/16] first s390x update for 5.0

Posted by Cornelia Huck 4 years, 4 months ago

The following changes since commit b0ca999a43a22b38158a222233d3f5881648bb4f:

  Update version for v4.2.0 release (2019-12-12 16:45:57 +0000)

are available in the Git repository at:

  https://github.com/cohuck/qemu tags/s390x-20191213

for you to fetch changes up to b147562019dd845a224cde7a37c219f9848d1b8d:

  qga: fence guest-set-time if hwclock not available (2019-12-13 12:16:50 +0100)

----------------------------------------------------------------
First s390x update for 5.0:
- compat machines (also for other architectures)
- cleanups and fixes in reset handling
- fence off guest-set-time, as we have no hwclock
- fix some misuses of the error API
- further cleanups

----------------------------------------------------------------

Boris Fiuczynski (1):
  vfio-ccw: Fix error message

Cornelia Huck (3):
  hw: add compat machines for 5.0
  s390x/tcg: clear local interrupts on reset normal
  qga: fence guest-set-time if hwclock not available

Janosch Frank (7):
  s390x: Don't do a normal reset on the initial cpu
  s390x: Move reset normal to shared reset handler
  s390x: Move initial reset
  s390x: Move clear reset
  s390x: Beautify diag308 handling
  s390x: kvm: Make kvm_sclp_service_call void
  s390x: Fix cpu normal reset ri clearing

Markus Armbruster (5):
  s390x/event-facility: Fix realize() error API violations
  s390x/cpumodel: Fix feature property error API violations
  s390x/cpumodel: Fix realize() error API violations
  s390x/cpumodel: Fix query-cpu-model-FOO error API violations
  s390x/cpumodel: Fix query-cpu-definitions error API violations

 hw/arm/virt.c              |   7 ++-
 hw/core/machine.c          |   3 +
 hw/i386/pc.c               |   3 +
 hw/i386/pc_piix.c          |  14 ++++-
 hw/i386/pc_q35.c           |  13 ++++-
 hw/ppc/spapr.c             |  15 ++++-
 hw/s390x/event-facility.c  |   6 +-
 hw/s390x/s390-virtio-ccw.c |  17 +++++-
 hw/vfio/ccw.c              |   2 +-
 include/hw/boards.h        |   3 +
 include/hw/i386/pc.h       |   3 +
 qga/commands-posix.c       |  13 ++++-
 target/s390x/cpu-qom.h     |   9 ++-
 target/s390x/cpu.c         | 112 +++++++++++++++----------------------
 target/s390x/cpu.h         |  19 ++++---
 target/s390x/cpu_models.c  |  98 +++++++++++++++++++-------------
 target/s390x/diag.c        |  54 ++++++++++--------
 target/s390x/kvm.c         |  12 ++--
 target/s390x/sigp.c        |   4 +-
 19 files changed, 250 insertions(+), 157 deletions(-)

-- 
2.21.0

Re: [PULL 00/16] first s390x update for 5.0

Posted by Peter Maydell 4 years, 4 months ago

On Fri, 13 Dec 2019 at 16:19, Cornelia Huck <cohuck@redhat.com> wrote:
>
> The following changes since commit b0ca999a43a22b38158a222233d3f5881648bb4f:
>
>   Update version for v4.2.0 release (2019-12-12 16:45:57 +0000)
>
> are available in the Git repository at:
>
>   https://github.com/cohuck/qemu tags/s390x-20191213
>
> for you to fetch changes up to b147562019dd845a224cde7a37c219f9848d1b8d:
>
>   qga: fence guest-set-time if hwclock not available (2019-12-13 12:16:50 +0100)
>
> ----------------------------------------------------------------
> First s390x update for 5.0:
> - compat machines (also for other architectures)
> - cleanups and fixes in reset handling
> - fence off guest-set-time, as we have no hwclock
> - fix some misuses of the error API
> - further cleanups
>
> ----------------------------------------------------------------
>

Hi -- this has conflicts. Most of them I could probably fix up,
but this one in particular:

diff --cc hw/s390x/s390-virtio-ccw.c
index cb5fe4c84d,e0e28139a2..0000000000
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@@ -645,9 -658,10 +658,13 @@@ static void ccw_machine_4_2_instance_op

  static void ccw_machine_4_2_class_options(MachineClass *mc)
  {
++<<<<<<< HEAD
++=======
+     ccw_machine_5_0_class_options(mc);
++>>>>>>> remotes/cohuck/tags/s390x-20191213
      compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len);
  }
- DEFINE_CCW_MACHINE(4_2, "4.2", true);
+ DEFINE_CCW_MACHINE(4_2, "4.2", false);

  static void ccw_machine_4_1_instance_options(MachineState *machine)
  {


I don't know whether we want the 'true' or 'false' version...

Could you rebase and resend, please?

thanks
-- PMM

Re: [PULL 00/16] first s390x update for 5.0

Posted by Cornelia Huck 4 years, 4 months ago

On Fri, 13 Dec 2019 21:12:18 +0000
Peter Maydell <peter.maydell@linaro.org> wrote:

> On Fri, 13 Dec 2019 at 16:19, Cornelia Huck <cohuck@redhat.com> wrote:
> >
> > The following changes since commit b0ca999a43a22b38158a222233d3f5881648bb4f:
> >
> >   Update version for v4.2.0 release (2019-12-12 16:45:57 +0000)
> >
> > are available in the Git repository at:
> >
> >   https://github.com/cohuck/qemu tags/s390x-20191213
> >
> > for you to fetch changes up to b147562019dd845a224cde7a37c219f9848d1b8d:
> >
> >   qga: fence guest-set-time if hwclock not available (2019-12-13 12:16:50 +0100)
> >
> > ----------------------------------------------------------------
> > First s390x update for 5.0:
> > - compat machines (also for other architectures)
> > - cleanups and fixes in reset handling
> > - fence off guest-set-time, as we have no hwclock
> > - fix some misuses of the error API
> > - further cleanups
> >
> > ----------------------------------------------------------------
> >  
> 
> Hi -- this has conflicts. Most of them I could probably fix up,
> but this one in particular:
> 
> diff --cc hw/s390x/s390-virtio-ccw.c
> index cb5fe4c84d,e0e28139a2..0000000000
> --- a/hw/s390x/s390-virtio-ccw.c
> +++ b/hw/s390x/s390-virtio-ccw.c
> @@@ -645,9 -658,10 +658,13 @@@ static void ccw_machine_4_2_instance_op
> 
>   static void ccw_machine_4_2_class_options(MachineClass *mc)
>   {
> ++<<<<<<< HEAD
> ++=======
> +     ccw_machine_5_0_class_options(mc);
> ++>>>>>>> remotes/cohuck/tags/s390x-20191213  
>       compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len);
>   }
> - DEFINE_CCW_MACHINE(4_2, "4.2", true);
> + DEFINE_CCW_MACHINE(4_2, "4.2", false);
> 
>   static void ccw_machine_4_1_instance_options(MachineState *machine)
>   {
> 
> 
> I don't know whether we want the 'true' or 'false' version...
> 
> Could you rebase and resend, please?
> 
> thanks
> -- PMM
> 

Yes, that's because 5f2585772fff ("virtio-blk: advertise F_WCE
(F_FLUSH) if F_CONFIG_WCE is advertised") introduced 4.2 compat options
before introducing the 5.0 machine types :/

Will send a rebased version.