[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 8/8] hw/s390x: Include the tod-qemu also for builds w
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PULL 8/8] hw/s390x: Include the tod-qemu also for builds with --disable-tcg |
Date: |
Fri, 12 Oct 2018 12:01:01 +0200 |
From: Thomas Huth <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/Makefile.objs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.14.4
- [Qemu-devel] [PULL 0/8] s390x updates, Cornelia Huck, 2018/10/12
- [Qemu-devel] [PULL 1/8] target/s390x/excp_helper: Remove DPRINTF() macro, Cornelia Huck, 2018/10/12
- [Qemu-devel] [PULL 4/8] s390x/kvm: enable AP instruction interpretation for guest, Cornelia Huck, 2018/10/12
- [Qemu-devel] [PULL 3/8] s390x/cpumodel: Set up CPU model for AP device support, Cornelia Huck, 2018/10/12
- [Qemu-devel] [PULL 2/8] linux-headers: update, Cornelia Huck, 2018/10/12
- [Qemu-devel] [PULL 5/8] s390x/ap: base Adjunct Processor (AP) object model, Cornelia Huck, 2018/10/12
- [Qemu-devel] [PULL 6/8] s390x/vfio: ap: Introduce VFIO AP device, Cornelia Huck, 2018/10/12
- [Qemu-devel] [PULL 7/8] s390: doc: detailed specifications for AP virtualization, Cornelia Huck, 2018/10/12
- [Qemu-devel] [PULL 8/8] hw/s390x: Include the tod-qemu also for builds with --disable-tcg,
Cornelia Huck <=
- Re: [Qemu-devel] [PULL 0/8] s390x updates, Peter Maydell, 2018/10/12