From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAb4i-0006vP-6e for qemu-devel@nongnu.org; Thu, 11 Oct 2018 09:32:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAb4X-0000zX-Lg for qemu-devel@nongnu.org; Thu, 11 Oct 2018 09:32:19 -0400 From: Thomas Huth Date: Thu, 11 Oct 2018 15:32:03 +0200 Message-Id: <1539264723-741-1-git-send-email-thuth@redhat.com> Subject: [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck , qemu-s390x@nongnu.org Cc: qemu-devel@nongnu.org, David Hildenbrand , Christian Borntraeger 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. Signed-off-by: Thomas Huth --- 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 5dbc00c..0efc64c 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 -- 1.8.3.1