* [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg
@ 2018-10-11 13:32 Thomas Huth
2018-10-11 13:33 ` David Hildenbrand
2018-10-11 14:17 ` Cornelia Huck
0 siblings, 2 replies; 3+ messages in thread
From: Thomas Huth @ 2018-10-11 13:32 UTC (permalink / raw)
To: Cornelia Huck, qemu-s390x
Cc: qemu-devel, 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 <thuth@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 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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg
2018-10-11 13:32 [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg Thomas Huth
@ 2018-10-11 13:33 ` David Hildenbrand
2018-10-11 14:17 ` Cornelia Huck
1 sibling, 0 replies; 3+ messages in thread
From: David Hildenbrand @ 2018-10-11 13:33 UTC (permalink / raw)
To: Thomas Huth, Cornelia Huck, qemu-s390x; +Cc: qemu-devel, Christian Borntraeger
On 11/10/2018 15:32, Thomas Huth wrote:
> 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 <thuth@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 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
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg
2018-10-11 13:32 [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg Thomas Huth
2018-10-11 13:33 ` David Hildenbrand
@ 2018-10-11 14:17 ` Cornelia Huck
1 sibling, 0 replies; 3+ messages in thread
From: Cornelia Huck @ 2018-10-11 14:17 UTC (permalink / raw)
To: Thomas Huth
Cc: qemu-s390x, qemu-devel, David Hildenbrand, Christian Borntraeger
On Thu, 11 Oct 2018 15:32:03 +0200
Thomas Huth <thuth@redhat.com> wrote:
> 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 <thuth@redhat.com>
Fixes: 8046f374a6 ("s390x/tod: factor out TOD into separate device")
> ---
> 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
Thanks, applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-10-11 14:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-11 13:32 [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg Thomas Huth
2018-10-11 13:33 ` David Hildenbrand
2018-10-11 14:17 ` Cornelia Huck
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).