|
 |
28c80a |
From abe7d93a04b4291bdcd406d180271143b16f2896 Mon Sep 17 00:00:00 2001
|
|
|
28c80a |
From: David Hildenbrand <david@redhat.com>
|
|
|
28c80a |
Date: Fri, 21 Dec 2018 15:39:55 +0100
|
|
|
28c80a |
Subject: [PATCH 11/14] hw/s390x: Include the tod-qemu also for builds with
|
|
|
28c80a |
--disable-tcg
|
|
|
28c80a |
|
|
|
28c80a |
RH-Author: David Hildenbrand <david@redhat.com>
|
|
|
28c80a |
Message-id: <20181221153957.28183-11-david@redhat.com>
|
|
|
28c80a |
Patchwork-id: 83764
|
|
|
28c80a |
O-Subject: [RHEL-7.6.z qemu-kvm-ma PATCH 10/12] hw/s390x: Include the tod-qemu also for builds with --disable-tcg
|
|
|
28c80a |
Bugzilla: 1672920
|
|
|
28c80a |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
28c80a |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
28c80a |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
28c80a |
|
|
|
28c80a |
The device is required for running qtests, see hw/s390x/tod.c:
|
|
|
28c80a |
|
|
|
28c80a |
void s390_init_tod(void)
|
|
|
28c80a |
{
|
|
|
28c80a |
Object *obj;
|
|
|
28c80a |
|
|
|
28c80a |
if (kvm_enabled()) {
|
|
|
28c80a |
obj = object_new(TYPE_KVM_S390_TOD);
|
|
|
28c80a |
} else {
|
|
|
28c80a |
obj = object_new(TYPE_QEMU_S390_TOD);
|
|
|
28c80a |
}
|
|
|
28c80a |
[...]
|
|
|
28c80a |
}
|
|
|
28c80a |
|
|
|
28c80a |
During qtests, we're running without kvm, so TYPE_QEMU_S390_TOD is
|
|
|
28c80a |
required to avoid that QEMU aborts here.
|
|
|
28c80a |
|
|
|
28c80a |
Fixes: 8046f374a6 ("s390x/tod: factor out TOD into separate device")
|
|
|
28c80a |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
28c80a |
Message-Id: <1539264723-741-1-git-send-email-thuth@redhat.com>
|
|
|
28c80a |
Reviewed-by: David Hildenbrand <david@redhat.com>
|
|
|
28c80a |
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
28c80a |
(cherry picked from commit 0161215d435ef5680c4623bcbdfe89ce5b35cf42)
|
|
|
28c80a |
Signed-off-by: David Hildenbrand <david@redhat.com>
|
|
|
28c80a |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
28c80a |
---
|
|
|
28c80a |
hw/s390x/Makefile.objs | 2 +-
|
|
|
28c80a |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
28c80a |
|
|
|
28c80a |
diff --git a/hw/s390x/Makefile.objs b/hw/s390x/Makefile.objs
|
|
|
28c80a |
index 93282f7..58b1866 100644
|
|
|
28c80a |
--- a/hw/s390x/Makefile.objs
|
|
|
28c80a |
+++ b/hw/s390x/Makefile.objs
|
|
|
28c80a |
@@ -15,8 +15,8 @@ obj-$(call lnot,$(CONFIG_PCI)) += s390-pci-stub.o
|
|
|
28c80a |
obj-y += s390-skeys.o
|
|
|
28c80a |
obj-y += s390-stattrib.o
|
|
|
28c80a |
obj-y += tod.o
|
|
|
28c80a |
+obj-y += tod-qemu.o
|
|
|
28c80a |
obj-$(CONFIG_KVM) += tod-kvm.o
|
|
|
28c80a |
-obj-$(CONFIG_TCG) += tod-qemu.o
|
|
|
28c80a |
obj-$(CONFIG_KVM) += s390-skeys-kvm.o
|
|
|
28c80a |
obj-$(CONFIG_KVM) += s390-stattrib-kvm.o
|
|
|
28c80a |
obj-y += s390-ccw.o
|
|
|
28c80a |
--
|
|
|
28c80a |
1.8.3.1
|
|
|
28c80a |
|