From: "Cho, Yu-Chen" <acho@suse.com>
To: qemu-devel@nongnu.org, qemu-s390x@nongnu.org
Cc: cfontana@suse.com, acho@suse.com,
Claudio Fontana <cfontana@suse.de>,
David Hildenbrand <david@redhat.com>,
Cornelia Huck <cohuck@redhat.com>
Subject: [RFC v5 04/13] hw/s390x: tod: make explicit checks for accelerators when initializing
Date: Tue, 22 Jun 2021 18:17:17 +0800 [thread overview]
Message-ID: <20210622101726.20860-5-acho@suse.com> (raw)
In-Reply-To: <20210622101726.20860-1-acho@suse.com>
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);
--
2.32.0
next prev parent reply other threads:[~2021-06-22 10:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 10:17 [RFC v5 00/13] s390x cleanup Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 01/13] target/s390x: meson: add target_user_arch Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 02/13] hw/s390x: rename tod-qemu.c to tod-tcg.c Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 03/13] hw/s390x: only build tod-tcg from the CONFIG_TCG build Cho, Yu-Chen
2021-06-22 10:17 ` Cho, Yu-Chen [this message]
2021-06-22 10:17 ` [RFC v5 05/13] target/s390x: remove tcg-stub.c Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 06/13] target/s390x: start moving TCG-only code to tcg/ Cho, Yu-Chen
2021-06-22 11:39 ` Cornelia Huck
2021-06-23 15:20 ` Al Cho
2021-06-22 10:17 ` [RFC v5 07/13] target/s390x: move sysemu-only code out to cpu-sysemu.c Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 08/13] target/s390x: split cpu-dump from helper.c Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 09/13] target/s390x: make helper.c sysemu-only Cho, Yu-Chen
2021-06-22 11:42 ` Cornelia Huck
2021-06-22 14:25 ` Al Cho
2021-06-22 10:17 ` [RFC v5 10/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 11/13] target/s390x: remove kvm-stub.c Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 12/13] target/s390x: move kvm files into kvm/ Cho, Yu-Chen
2021-06-22 10:17 ` [RFC v5 13/13] target/s390x: split sysemu part of cpu models Cho, Yu-Chen
2021-06-22 10:31 ` [RFC v5 00/13] s390x cleanup Al Cho
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=20210622101726.20860-5-acho@suse.com \
--to=acho@suse.com \
--cc=cfontana@suse.com \
--cc=cfontana@suse.de \
--cc=cohuck@redhat.com \
--cc=david@redhat.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).