From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-s390x <qemu-s390x@nongnu.org>,
QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PULL 00/16] first s390x update for 5.0
Date: Sat, 14 Dec 2019 10:30:19 +0100 [thread overview]
Message-ID: <20191214103019.74bcd9f8.cohuck@redhat.com> (raw)
In-Reply-To: <CAFEAcA8O=ezHAQKKr9zrA0M_TE-FbnHmict5K8_+5v64BDoTxA@mail.gmail.com>
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.
prev parent reply other threads:[~2019-12-14 9:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 16:18 [PULL 00/16] first s390x update for 5.0 Cornelia Huck
2019-12-13 16:18 ` [PULL 01/16] vfio-ccw: Fix error message Cornelia Huck
2019-12-13 16:18 ` [PULL 02/16] hw: add compat machines for 5.0 Cornelia Huck
2019-12-13 16:18 ` [PULL 03/16] s390x: Don't do a normal reset on the initial cpu Cornelia Huck
2019-12-13 16:18 ` [PULL 04/16] s390x: Move reset normal to shared reset handler Cornelia Huck
2019-12-13 16:18 ` [PULL 05/16] s390x: Move initial reset Cornelia Huck
2019-12-13 16:18 ` [PULL 06/16] s390x: Move clear reset Cornelia Huck
2019-12-13 16:18 ` [PULL 07/16] s390x: Beautify diag308 handling Cornelia Huck
2019-12-13 16:18 ` [PULL 08/16] s390x: kvm: Make kvm_sclp_service_call void Cornelia Huck
2019-12-13 16:18 ` [PULL 09/16] s390x: Fix cpu normal reset ri clearing Cornelia Huck
2019-12-13 16:18 ` [PULL 10/16] s390x/event-facility: Fix realize() error API violations Cornelia Huck
2019-12-13 16:18 ` [PULL 11/16] s390x/cpumodel: Fix feature property " Cornelia Huck
2019-12-13 16:18 ` [PULL 12/16] s390x/cpumodel: Fix realize() " Cornelia Huck
2019-12-13 16:18 ` [PULL 13/16] s390x/cpumodel: Fix query-cpu-model-FOO " Cornelia Huck
2019-12-13 16:18 ` [PULL 14/16] s390x/cpumodel: Fix query-cpu-definitions " Cornelia Huck
2019-12-13 16:18 ` [PULL 15/16] s390x/tcg: clear local interrupts on reset normal Cornelia Huck
2019-12-13 16:18 ` [PULL 16/16] qga: fence guest-set-time if hwclock not available Cornelia Huck
2019-12-13 21:12 ` [PULL 00/16] first s390x update for 5.0 Peter Maydell
2019-12-14 9:30 ` Cornelia Huck [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191214103019.74bcd9f8.cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).