From: David Hildenbrand <david@redhat.com>
To: Claudio Fontana <cfontana@suse.de>,
Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>
Cc: Halil Pasic <pasic@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [RFC v3 03/13] hw/s390x: tod: make explicit checks for accelerators when initializing
Date: Wed, 28 Apr 2021 12:08:29 +0200 [thread overview]
Message-ID: <6c7166a8-251d-0fbc-2277-98b15afc650e@redhat.com> (raw)
In-Reply-To: <20210422115430.15078-4-cfontana@suse.de>
On 22.04.21 13:54, Claudio Fontana 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>
> ---
> 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);
>
As long as qtest keeps working, fine with me
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2021-04-28 10:14 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-22 11:54 [RFC v3 00/13] s390x cleanup Claudio Fontana
2021-04-22 11:54 ` [RFC v3 01/13] hw/s390x: rename tod-qemu.c to tod-tcg.c Claudio Fontana
2021-04-27 14:09 ` Cornelia Huck
2021-04-28 10:07 ` David Hildenbrand
2021-04-22 11:54 ` [RFC v3 02/13] hw/s390x: only build tod-tcg from the CONFIG_TCG build Claudio Fontana
2021-04-27 14:11 ` Cornelia Huck
2021-04-28 10:07 ` David Hildenbrand
2021-04-22 11:54 ` [RFC v3 03/13] hw/s390x: tod: make explicit checks for accelerators when initializing Claudio Fontana
2021-04-27 14:13 ` Cornelia Huck
2021-04-28 10:08 ` David Hildenbrand [this message]
2021-04-22 11:54 ` [RFC v3 04/13] target/s390x: remove tcg-stub.c Claudio Fontana
2021-04-27 14:55 ` Cornelia Huck
2021-04-22 11:54 ` [RFC v3 05/13] target/s390x: start moving TCG-only code to tcg/ Claudio Fontana
2021-04-28 10:08 ` David Hildenbrand
2021-04-22 11:54 ` [RFC v3 06/13] target/s390x: move sysemu-only code out to cpu-sysemu.c Claudio Fontana
2021-04-22 11:54 ` [RFC v3 07/13] target/s390x: split cpu-dump from helper.c Claudio Fontana
2021-04-22 11:54 ` [RFC v3 08/13] target/s390x: make helper.c sysemu-only Claudio Fontana
2021-04-22 11:54 ` [RFC v3 09/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m Claudio Fontana
2021-04-22 11:54 ` [RFC v3 10/13] target/s390x: remove kvm-stub.c Claudio Fontana
2021-04-22 11:54 ` [RFC v3 11/13] target/s390x: move kvm files into kvm/ Claudio Fontana
2021-04-22 11:54 ` [RFC v3 12/13] target/s390x: split sysemu part of cpu models Claudio Fontana
2021-04-22 11:54 ` [RFC v3 13/13] MAINTAINERS: update s390x directories Claudio Fontana
2021-04-27 15:00 ` Cornelia Huck
2021-04-28 10:30 ` Claudio Fontana
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=6c7166a8-251d-0fbc-2277-98b15afc650e@redhat.com \
--to=david@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cfontana@suse.de \
--cc=cohuck@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/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).