[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC v4 04/14] hw/s390x: tod: make explicit checks for accelerators when
From: |
Cho, Yu-Chen |
Subject: |
[RFC v4 04/14] hw/s390x: tod: make explicit checks for accelerators when initializing |
Date: |
Mon, 24 May 2021 10:52:46 +0800 |
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.31.1
- [RFC v4 01/14] target/s390x: meson: add target_user_arch, Cho, Yu-Chen, 2021/05/24
- [RFC v4 02/14] hw/s390x: rename tod-qemu.c to tod-tcg.c, Cho, Yu-Chen, 2021/05/24
- [RFC v4 03/14] hw/s390x: only build tod-tcg from the CONFIG_TCG build, Cho, Yu-Chen, 2021/05/24
- [RFC v4 04/14] hw/s390x: tod: make explicit checks for accelerators when initializing,
Cho, Yu-Chen <=
- [RFC v4 05/14] target/s390x: remove tcg-stub.c, Cho, Yu-Chen, 2021/05/24
- [RFC v4 06/14] target/s390x: start moving TCG-only code to tcg/, Cho, Yu-Chen, 2021/05/24
- [RFC v4 07/14] target/s390x: move sysemu-only code out to cpu-sysemu.c, Cho, Yu-Chen, 2021/05/24
- [RFC v4 10/14] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m, Cho, Yu-Chen, 2021/05/24
- [RFC v4 08/14] target/s390x: split cpu-dump from helper.c, Cho, Yu-Chen, 2021/05/24
- [RFC v4 12/14] target/s390x: move kvm files into kvm/, Cho, Yu-Chen, 2021/05/24
- [RFC v4 13/14] target/s390x: split sysemu part of cpu models, Cho, Yu-Chen, 2021/05/24
- [RFC v4 09/14] target/s390x: make helper.c sysemu-only, Cho, Yu-Chen, 2021/05/24
- [RFC v4 11/14] target/s390x: remove kvm-stub.c, Cho, Yu-Chen, 2021/05/24
- [RFC v4 14/14] MAINTAINERS: update s390x directories, Cho, Yu-Chen, 2021/05/24