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

[Peter Maydell <peter.maydell@linaro.org>]

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