s390x/kvm: sync gbea and pp register

We also need to sync guest breaking event address and program parameter
register for migration support.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index f332d41b9443dbf1239f91ad226281a4813d9586..41903a93fbbeaaf547f410a0ec64dda7db712df5 100644 (file)
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -126,6 +126,9 @@ typedef struct CPUS390XState {
     uint64_t pfault_compare;
     uint64_t pfault_select;
 
+    uint64_t gbea;
+    uint64_t pp;
+
     CPU_COMMON
 
     /* reset does memset(0) up to here */

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index daaabbd6741a497a620c556d3d838484ab97eb8a..a30d1bc060050bd6134c96bb9e76feeed21694e3 100644 (file)
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -199,6 +199,8 @@ int kvm_arch_put_registers(CPUState *cs, int level)
     kvm_set_one_reg(cs, KVM_REG_S390_CPU_TIMER, &env->cputm);
     kvm_set_one_reg(cs, KVM_REG_S390_CLOCK_COMP, &env->ckc);
     kvm_set_one_reg(cs, KVM_REG_S390_TODPR, &env->todpr);
+    kvm_set_one_reg(cs, KVM_REG_S390_GBEA, &env->gbea);
+    kvm_set_one_reg(cs, KVM_REG_S390_PP, &env->pp);
 
     if (cap_async_pf) {
         r = kvm_set_one_reg(cs, KVM_REG_S390_PFTOKEN, &env->pfault_token);
@@ -304,6 +306,8 @@ int kvm_arch_get_registers(CPUState *cs)
     kvm_get_one_reg(cs, KVM_REG_S390_CPU_TIMER, &env->cputm);
     kvm_get_one_reg(cs, KVM_REG_S390_CLOCK_COMP, &env->ckc);
     kvm_get_one_reg(cs, KVM_REG_S390_TODPR, &env->todpr);
+    kvm_get_one_reg(cs, KVM_REG_S390_GBEA, &env->gbea);
+    kvm_get_one_reg(cs, KVM_REG_S390_PP, &env->pp);
 
     if (cap_async_pf) {
         r = kvm_get_one_reg(cs, KVM_REG_S390_PFTOKEN, &env->pfault_token);