hw/s390x: Include the tod-qemu also for builds with --disable-tcg

[Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg

Posted by Thomas Huth 7 years ago

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

Re: [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg

Posted by David Hildenbrand 7 years ago

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

Re: [Qemu-devel] [PATCH] hw/s390x: Include the tod-qemu also for builds with --disable-tcg

Posted by Cornelia Huck 7 years ago

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.