Commit 7c12f710 authored by David Hildenbrand's avatar David Hildenbrand Committed by Cornelia Huck
Browse files

s390x/tcg: rearm the CKC timer during migration 



If the CPU data is migrated after the TOD clock, the CKC timer of a CPU
is not rearmed. Let's rearm it when loading the CPU state.

Introduce tcg-stub.c just like kvm-stub.c for tcg specific stubs.

Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20180627134410.4901-9-david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent 9dc67537

target/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ obj-$(CONFIG_SOFTMMU) += machine.o ioinst.o arch_dump.o mmu_helper.o diag.o 
obj-$(CONFIG_SOFTMMU) += sigp.o

obj-$(CONFIG_KVM) += kvm.o

obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o

obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o



# build and run feature list generator

feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/

target/s390x/machine.c

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "cpu.h"

#include "internal.h"

#include "kvm_s390x.h"

#include "tcg_s390x.h"

#include "sysemu/kvm.h"



static int cpu_post_load(void *opaque, int version_id)
@@ -34,6 +35,11 @@ static int cpu_post_load(void *opaque, int version_id) 
        return kvm_s390_vcpu_interrupt_post_load(cpu);

    }



    if (tcg_enabled()) {

        /* Rearm the CKC timer if necessary */

        tcg_s390_tod_updated(CPU(cpu), RUN_ON_CPU_NULL);

    }



    return 0;

}

target/s390x/tcg-stub.c

0 → 100644
+20 −0
Original line number Diff line number Diff line 
/*

 * QEMU TCG support -- s390x specific function stubs.

 *

 * Copyright (C) 2018 Red Hat Inc

 *

 * Authors:

 *   David Hildenbrand <david@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 */



#include "qemu/osdep.h"

#include "qemu-common.h"

#include "cpu.h"

#include "tcg_s390x.h"



void tcg_s390_tod_updated(CPUState *cs, run_on_cpu_data opaque)

{

}