From: Thomas Huth <thuth@redhat.com>
To: "Cho, Yu-Chen" <acho@suse.com>,
qemu-devel@nongnu.org, qemu-s390x@nongnu.org
Cc: Cornelia Huck <cohuck@redhat.com>,
cfontana@suse.com, David Hildenbrand <david@redhat.com>,
Claudio Fontana <cfontana@suse.de>,
jose.ziviani@suse.com
Subject: Re: [RFC v6 04/13] hw/s390x: tod: make explicit checks for accelerators when initializing
Date: Thu, 1 Jul 2021 12:32:46 +0200 [thread overview]
Message-ID: <50d5a101-3c71-5393-fae4-641b56651a06@redhat.com> (raw)
In-Reply-To: <20210629141931.4489-5-acho@suse.com>
On 29/06/2021 16.19, Cho, Yu-Chen wrote:
> replace general "else" with specific checks for each possible accelerator.
>
> Handle qtest as a NOP, and error out for an unknown accelerator used in
> combination with tod.
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Reviewed-by: David Hildenbrand <david@redhat.com>
> Reviewed-by: Cornelia Huck <cohuck@redhat.com>
> Signed-off-by: Cho, Yu-Chen <acho@suse.com>
> ---
> hw/s390x/tod.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/tod.c b/hw/s390x/tod.c
> index 3c2979175e..fd5a36bf24 100644
> --- a/hw/s390x/tod.c
> +++ b/hw/s390x/tod.c
> @@ -14,6 +14,8 @@
> #include "qemu/error-report.h"
> #include "qemu/module.h"
> #include "sysemu/kvm.h"
> +#include "sysemu/tcg.h"
> +#include "sysemu/qtest.h"
> #include "migration/qemu-file-types.h"
> #include "migration/register.h"
>
> @@ -23,8 +25,13 @@ void s390_init_tod(void)
>
> if (kvm_enabled()) {
> obj = object_new(TYPE_KVM_S390_TOD);
> - } else {
> + } else if (tcg_enabled()) {
> obj = object_new(TYPE_QEMU_S390_TOD);
> + } else if (qtest_enabled()) {
> + return;
> + } else {
> + error_report("current accelerator not handled in s390_init_tod!");
> + abort();
> }
> object_property_add_child(qdev_get_machine(), TYPE_S390_TOD, obj);
> object_unref(obj);
>
I think it might be better to swap the order of patch 03 and 04, to avoid
that the qtests might break during bisecting later.
For this patch itself:
Reviewed-by: Thomas Huth <thuth@redhat.com>
next prev parent reply other threads:[~2021-07-01 10:34 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-29 14:19 [RFC v6 00/13] s390x cleanup Cho, Yu-Chen
2021-06-29 14:19 ` [RFC v6 01/13] target/s390x: meson: add target_user_arch Cho, Yu-Chen
2021-07-01 15:40 ` Richard Henderson
2021-06-29 14:19 ` [RFC v6 02/13] hw/s390x: rename tod-qemu.c to tod-tcg.c Cho, Yu-Chen
2021-07-01 10:11 ` Thomas Huth
2021-07-02 6:54 ` Al Cho
2021-06-29 14:19 ` [RFC v6 03/13] hw/s390x: only build tod-tcg from the CONFIG_TCG build Cho, Yu-Chen
2021-07-01 10:36 ` Thomas Huth
2021-06-29 14:19 ` [RFC v6 04/13] hw/s390x: tod: make explicit checks for accelerators when initializing Cho, Yu-Chen
2021-07-01 10:32 ` Thomas Huth [this message]
2021-07-01 15:16 ` Al Cho via
2021-06-29 14:19 ` [RFC v6 05/13] target/s390x: remove tcg-stub.c Cho, Yu-Chen
2021-07-01 10:40 ` Thomas Huth
2021-06-29 14:19 ` [RFC v6 06/13] target/s390x: start moving TCG-only code to tcg/ Cho, Yu-Chen
2021-07-01 10:51 ` Thomas Huth
2021-07-02 7:24 ` Al Cho
2021-06-29 14:19 ` [RFC v6 07/13] target/s390x: move sysemu-only code out to cpu-sysemu.c Cho, Yu-Chen
2021-06-30 15:12 ` Cornelia Huck
2021-07-01 11:41 ` Thomas Huth
2021-06-29 14:19 ` [RFC v6 08/13] target/s390x: split cpu-dump from helper.c Cho, Yu-Chen
2021-07-01 12:35 ` Thomas Huth
2021-07-02 7:25 ` Al Cho
2021-07-05 6:25 ` Claudio Fontana
2021-07-06 8:47 ` Al Cho
2021-07-06 9:06 ` Thomas Huth
2021-07-06 9:19 ` Claudio Fontana
2021-06-29 14:19 ` [RFC v6 09/13] target/s390x: make helper.c sysemu-only Cho, Yu-Chen
2021-07-01 12:36 ` Thomas Huth
2021-07-02 7:27 ` Al Cho
2021-06-29 14:19 ` [RFC v6 10/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m Cho, Yu-Chen
2021-06-30 15:21 ` Cornelia Huck
2021-07-01 5:25 ` Al Cho
2021-07-01 19:16 ` Thomas Huth
2021-06-29 14:19 ` [RFC v6 11/13] target/s390x: remove kvm-stub.c Cho, Yu-Chen
2021-06-30 15:23 ` Cornelia Huck
2021-07-01 19:17 ` Thomas Huth
2021-06-29 14:19 ` [RFC v6 12/13] target/s390x: move kvm files into kvm/ Cho, Yu-Chen
2021-06-30 15:24 ` Cornelia Huck
2021-07-01 19:30 ` Thomas Huth
2021-07-06 18:32 ` Al Cho
2021-06-29 14:19 ` [RFC v6 13/13] target/s390x: split sysemu part of cpu models Cho, Yu-Chen
2021-07-02 7:43 ` Thomas Huth
2021-06-30 15:27 ` [RFC v6 00/13] s390x cleanup Cornelia Huck
2021-07-05 9:34 ` Cornelia Huck
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=50d5a101-3c71-5393-fae4-641b56651a06@redhat.com \
--to=thuth@redhat.com \
--cc=acho@suse.com \
--cc=cfontana@suse.com \
--cc=cfontana@suse.de \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=jose.ziviani@suse.com \
--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).