Patchwork [1/7] KVM regsync: Rename KVM_PUT_ constants to KVM_REGSYNC_

login
register
mail settings
Submitter Jason J. Herne
Date Dec. 21, 2012, 1:55 p.m.
Message ID <1356098145-4772-1-git-send-email-jjherne@us.ibm.com>
Download mbox | patch
Permalink /patch/207812/
State New
Headers show

Comments

Jason J. Herne - Dec. 21, 2012, 1:55 p.m.
From: "Jason J. Herne" <jjherne@us.ibm.com>

It makes sense to rename these to KVM_REGSYNC in order to use them for
specifying a register level parameter for both kvm_arch_put_registers
and kvm_arch_get_registers.

Signed-off-by: Jason J. Herne <jjherne@us.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
---
 include/sysemu/kvm.h |   10 +++++-----
 kvm-all.c            |    6 +++---
 target-i386/kvm.c    |    8 ++++----
 target-ppc/kvm.c     |    4 ++--
 target-s390x/kvm.c   |    2 +-
 5 files changed, 15 insertions(+), 15 deletions(-)

Patch

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 131d2bd..4271699 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -165,14 +165,14 @@  int kvm_arch_handle_exit(CPUArchState *env, struct kvm_run *run);
 
 int kvm_arch_process_async_events(CPUArchState *env);
 
-int kvm_arch_get_registers(CPUArchState *env);
-
 /* state subset only touched by the VCPU itself during runtime */
-#define KVM_PUT_RUNTIME_STATE   1
+#define KVM_REGSYNC_RUNTIME_STATE   1
 /* state subset modified during VCPU reset */
-#define KVM_PUT_RESET_STATE     2
+#define KVM_REGSYNC_RESET_STATE     2
 /* full state set, modified during initialization or on vmload */
-#define KVM_PUT_FULL_STATE      3
+#define KVM_REGSYNC_FULL_STATE      3
+
+int kvm_arch_get_registers(CPUArchState *env);
 
 int kvm_arch_put_registers(CPUArchState *env, int level);
 
diff --git a/kvm-all.c b/kvm-all.c
index 5aa65c4..f4365de 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -1507,13 +1507,13 @@  void kvm_cpu_synchronize_state(CPUArchState *env)
 
 void kvm_cpu_synchronize_post_reset(CPUArchState *env)
 {
-    kvm_arch_put_registers(env, KVM_PUT_RESET_STATE);
+    kvm_arch_put_registers(env, KVM_REGSYNC_RESET_STATE);
     env->kvm_vcpu_dirty = 0;
 }
 
 void kvm_cpu_synchronize_post_init(CPUArchState *env)
 {
-    kvm_arch_put_registers(env, KVM_PUT_FULL_STATE);
+    kvm_arch_put_registers(env, KVM_REGSYNC_FULL_STATE);
     env->kvm_vcpu_dirty = 0;
 }
 
@@ -1531,7 +1531,7 @@  int kvm_cpu_exec(CPUArchState *env)
 
     do {
         if (env->kvm_vcpu_dirty) {
-            kvm_arch_put_registers(env, KVM_PUT_RUNTIME_STATE);
+            kvm_arch_put_registers(env, KVM_REGSYNC_RUNTIME_STATE);
             env->kvm_vcpu_dirty = 0;
         }
 
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index f63b1fb..58ac3a8 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -1029,7 +1029,7 @@  static int kvm_put_msrs(CPUX86State *env, int level)
         kvm_msr_entry_set(&msrs[n++], MSR_LSTAR, env->lstar);
     }
 #endif
-    if (level == KVM_PUT_FULL_STATE) {
+    if (level == KVM_REGSYNC_FULL_STATE) {
         /*
          * KVM is yet unable to synchronize TSC values of multiple VCPUs on
          * writeback. Until this is fixed, we only write the offset to SMP
@@ -1045,7 +1045,7 @@  static int kvm_put_msrs(CPUX86State *env, int level)
      * too heavy for normal writeback. Limit them to reset or full state
      * updates.
      */
-    if (level >= KVM_PUT_RESET_STATE) {
+    if (level >= KVM_REGSYNC_RESET_STATE) {
         kvm_msr_entry_set(&msrs[n++], MSR_KVM_SYSTEM_TIME,
                           env->system_time_msr);
         kvm_msr_entry_set(&msrs[n++], MSR_KVM_WALL_CLOCK, env->wall_clock_msr);
@@ -1470,7 +1470,7 @@  static int kvm_put_vcpu_events(CPUX86State *env, int level)
     events.sipi_vector = env->sipi_vector;
 
     events.flags = 0;
-    if (level >= KVM_PUT_RESET_STATE) {
+    if (level >= KVM_REGSYNC_RESET_STATE) {
         events.flags |=
             KVM_VCPUEVENT_VALID_NMI_PENDING | KVM_VCPUEVENT_VALID_SIPI_VECTOR;
     }
@@ -1615,7 +1615,7 @@  int kvm_arch_put_registers(CPUX86State *env, int level)
     if (ret < 0) {
         return ret;
     }
-    if (level >= KVM_PUT_RESET_STATE) {
+    if (level >= KVM_REGSYNC_RESET_STATE) {
         ret = kvm_put_mp_state(env);
         if (ret < 0) {
             return ret;
diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 88650d4..f2e6eca 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -474,7 +474,7 @@  int kvm_arch_put_registers(CPUPPCState *env, int level)
         env->tlb_dirty = false;
     }
 
-    if (cap_segstate && (level >= KVM_PUT_RESET_STATE)) {
+    if (cap_segstate && (level >= KVM_REGSYNC_RESET_STATE)) {
         struct kvm_sregs sregs;
 
         sregs.pvr = env->spr[SPR_PVR];
@@ -509,7 +509,7 @@  int kvm_arch_put_registers(CPUPPCState *env, int level)
         }
     }
 
-    if (cap_hior && (level >= KVM_PUT_RESET_STATE)) {
+    if (cap_hior && (level >= KVM_REGSYNC_RESET_STATE)) {
         uint64_t hior = env->spr[SPR_HIOR];
         struct kvm_one_reg reg = {
             .id = KVM_REG_PPC_HIOR,
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index 762231d..5a845c3 100644
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -115,7 +115,7 @@  int kvm_arch_put_registers(CPUS390XState *env, int level)
     }
 
     /* Do we need to save more than that? */
-    if (level == KVM_PUT_RUNTIME_STATE) {
+    if (level == KVM_REGSYNC_RUNTIME_STATE) {
         return 0;
     }