diff options
| author | Cho, Yu-Chen <acho@suse.com> | 2021-07-07 18:53:13 +0800 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2021-07-07 14:01:54 +0200 |
| commit | 4f91550a0962519e5c54330833486d7940417be0 (patch) | |
| tree | b88d9eeb56dfe1a87fd25b23ac61870becd1c001 /hw/s390x | |
| parent | 85f1b67d4bcbdc6a12c3d2416df1a6d599414ee5 (diff) | |
| download | qemu-4f91550a0962519e5c54330833486d7940417be0.zip qemu-4f91550a0962519e5c54330833486d7940417be0.tar.gz qemu-4f91550a0962519e5c54330833486d7940417be0.tar.bz2 | |
hw/s390x: tod: make explicit checks for accelerators when initializing
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>
Signed-off-by: Cho, Yu-Chen <acho@suse.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20210707105324.23400-4-acho@suse.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/s390x')
| -rw-r--r-- | hw/s390x/tod.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/s390x/tod.c b/hw/s390x/tod.c index 3c29791..fd5a36b 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); |