From: Cornelia Huck <cohuck@redhat.com>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>,
Alexander Graf <agraf@suse.de>,
Richard Henderson <rth@twiddle.net>,
David Hildenbrand <david@redhat.com>,
Thomas Huth <thuth@redhat.com>,
qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
Cornelia Huck <cohuck@redhat.com>
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 [thread overview]
Message-ID: <20181012100101.29058-9-cohuck@redhat.com> (raw)
In-Reply-To: <20181012100101.29058-1-cohuck@redhat.com>
From: Thomas Huth <thuth@redhat.com>
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>
---
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
next prev parent reply other threads:[~2018-10-12 10:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-12 10:00 [Qemu-devel] [PULL 0/8] s390x updates Cornelia Huck
2018-10-12 10:00 ` [Qemu-devel] [PULL 1/8] target/s390x/excp_helper: Remove DPRINTF() macro Cornelia Huck
2018-10-12 10:00 ` [Qemu-devel] [PULL 2/8] linux-headers: update Cornelia Huck
2018-10-12 10:00 ` [Qemu-devel] [PULL 3/8] s390x/cpumodel: Set up CPU model for AP device support Cornelia Huck
2018-10-12 10:00 ` [Qemu-devel] [PULL 4/8] s390x/kvm: enable AP instruction interpretation for guest Cornelia Huck
2018-10-12 10:00 ` [Qemu-devel] [PULL 5/8] s390x/ap: base Adjunct Processor (AP) object model Cornelia Huck
2018-10-12 10:00 ` [Qemu-devel] [PULL 6/8] s390x/vfio: ap: Introduce VFIO AP device Cornelia Huck
2018-10-16 11:36 ` Peter Maydell
2018-10-12 10:01 ` [Qemu-devel] [PULL 7/8] s390: doc: detailed specifications for AP virtualization Cornelia Huck
2018-10-12 10:01 ` Cornelia Huck [this message]
2018-10-12 12:39 ` [Qemu-devel] [PULL 0/8] s390x updates Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181012100101.29058-9-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=agraf@suse.de \
--cc=borntraeger@de.ibm.com \
--cc=david@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).