From patchwork Fri Oct 12 10:01:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cornelia Huck X-Patchwork-Id: 982966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42Wk7n0xbJz9s3l for ; Fri, 12 Oct 2018 21:08:53 +1100 (AEDT) Received: from localhost ([::1]:39328 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAuNG-0006JI-Pi for incoming@patchwork.ozlabs.org; Fri, 12 Oct 2018 06:08:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAuGM-000140-8M for qemu-devel@nongnu.org; Fri, 12 Oct 2018 06:01:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAuGI-0007u6-RQ for qemu-devel@nongnu.org; Fri, 12 Oct 2018 06:01:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42906) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gAuGI-0007tH-Jg; Fri, 12 Oct 2018 06:01:38 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C1AA77F3E1; Fri, 12 Oct 2018 10:01:37 +0000 (UTC) Received: from localhost (dhcp-192-213.str.redhat.com [10.33.192.213]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 18C0E6E51D; Fri, 12 Oct 2018 10:01:31 +0000 (UTC) From: Cornelia Huck To: Peter Maydell Date: Fri, 12 Oct 2018 12:01:01 +0200 Message-Id: <20181012100101.29058-9-cohuck@redhat.com> In-Reply-To: <20181012100101.29058-1-cohuck@redhat.com> References: <20181012100101.29058-1-cohuck@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 12 Oct 2018 10:01:37 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 8/8] hw/s390x: Include the tod-qemu also for builds with --disable-tcg X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , David Hildenbrand , Cornelia Huck , Alexander Graf , qemu-devel@nongnu.org, Christian Borntraeger , qemu-s390x@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth 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 Message-Id: <1539264723-741-1-git-send-email-thuth@redhat.com> Reviewed-by: David Hildenbrand Signed-off-by: Cornelia Huck --- 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