diff options
| author | Thomas Huth <thuth@redhat.com> | 2018-10-11 15:32:03 +0200 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2018-10-12 11:32:19 +0200 |
| commit | 0161215d435ef5680c4623bcbdfe89ce5b35cf42 (patch) | |
| tree | ef6ffa5c7dbf92f91d4199399d03e6533a0e192f /hw/s390x/Makefile.objs | |
| parent | 694a8d703bfe06226a0574f5ec4af17a2b7060ef (diff) | |
| download | qemu-0161215d435ef5680c4623bcbdfe89ce5b35cf42.zip | |
hw/s390x: Include the tod-qemu also for builds with --disable-tcg
The device is required for running qtests, see hw/s390x/tod.c:
void s390_init_tod(void)
{
Object *obj;
if (kvm_enabled()) {
obj = object_new(TYPE_KVM_S390_TOD);
} else {
obj = object_new(TYPE_QEMU_S390_TOD);
}
[...]
}
During qtests, we're running without kvm, so TYPE_QEMU_S390_TOD is
required to avoid that QEMU aborts here.
Fixes: 8046f374a6 ("s390x/tod: factor out TOD into separate device")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1539264723-741-1-git-send-email-thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Diffstat (limited to 'hw/s390x/Makefile.objs')
| -rw-r--r-- | hw/s390x/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs index 49cae2f5c4..ca68806e44 100644 --- a/hw/s390x/Makefile.objs +++ b/hw/s390x/Makefile.objs @@ -26,8 +26,8 @@ obj-$(call lnot,$(CONFIG_PCI)) += s390-pci-stub.o obj-y += s390-skeys.o obj-y += s390-stattrib.o obj-y += tod.o +obj-y += tod-qemu.o obj-$(CONFIG_KVM) += tod-kvm.o -obj-$(CONFIG_TCG) += tod-qemu.o obj-$(CONFIG_KVM) += s390-skeys-kvm.o obj-$(CONFIG_KVM) += s390-stattrib-kvm.o obj-y += s390-ccw.o |