On 04.06.2018 13:38, Cornelia Huck wrote: > On Fri, 25 May 2018 13:37:02 +0200 > David Hildenbrand <da...@redhat.com> wrote: > >> Let's treat this like a separate device. TCG will have to store the >> actual state/time later on. >> >> Include cpu-qom.h in kvm_s390x.h (due to S390CPU) to compile tod-kvm.c. > > Can't you include it in tod-kvm.c instead? Why was it not needed before?
Guess I can, kvm_s390x.h looks to me like the right place, as S390CPU is used in there. All other users include "cpu.h" already, so it isn't needed. > >> >> Signed-off-by: David Hildenbrand <da...@redhat.com> >> --- >> hw/s390x/Makefile.objs | 3 + >> hw/s390x/s390-virtio-ccw.c | 57 +----------------- >> hw/s390x/tod-kvm.c | 64 ++++++++++++++++++++ >> hw/s390x/tod-qemu.c | 47 +++++++++++++++ >> hw/s390x/tod.c | 120 +++++++++++++++++++++++++++++++++++++ >> include/hw/s390x/tod.h | 46 ++++++++++++++ >> target/s390x/cpu.c | 32 ---------- >> target/s390x/cpu.h | 2 - >> target/s390x/kvm_s390x.h | 2 + >> 9 files changed, 285 insertions(+), 88 deletions(-) >> create mode 100644 hw/s390x/tod-kvm.c >> create mode 100644 hw/s390x/tod-qemu.c >> create mode 100644 hw/s390x/tod.c >> create mode 100644 include/hw/s390x/tod.h > > Otherwise, looks good. > -- Thanks, David / dhildenb