From 9d1e37615a8285d852b7d8f829b9f9aeed703f14 Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Mon, 22 Jul 2019 18:22:04 +0100

Subject: [PATCH 23/39] target/i386: rename HF_SVMI_MASK to HF_GUEST_MASK

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20190722182220.19374-3-pbonzini@redhat.com>

Patchwork-id: 89620

O-Subject: [RHEL-8.1.0 PATCH qemu-kvm v3 02/18] target/i386: rename HF_SVMI_MASK to HF_GUEST_MASK

Bugzilla: 1689269

RH-Acked-by: Peter Xu <zhexu@redhat.com>

RH-Acked-by: Laurent Vivier <lvivier@redhat.com>

RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

This flag will be used for KVM's nested VMX migration; the HF_GUEST_MASK name

is already used in KVM, adopt it in QEMU as well.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

(cherry picked from commit f8dc4c645ec2956a6cd97e0ca0fdd4753181f735)

Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>

---

 target/i386/cpu.h         | 4 ++--

 target/i386/excp_helper.c | 2 +-

 target/i386/seg_helper.c  | 6 +++---

 target/i386/svm_helper.c  | 6 +++---

 target/i386/translate.c   | 4 ++--

 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/target/i386/cpu.h b/target/i386/cpu.h

index 4f9df6e..923dfcd 100644

--- a/target/i386/cpu.h

+++ b/target/i386/cpu.h

@@ -171,7 +171,7 @@ typedef enum X86Seg {

 #define HF_AC_SHIFT         18 /* must be same as eflags */

 #define HF_SMM_SHIFT        19 /* CPU in SMM mode */

 #define HF_SVME_SHIFT       20 /* SVME enabled (copy of EFER.SVME) */

-#define HF_SVMI_SHIFT       21 /* SVM intercepts are active */

+#define HF_GUEST_SHIFT      21 /* SVM intercepts are active */

 #define HF_OSFXSR_SHIFT     22 /* CR4.OSFXSR */

 #define HF_SMAP_SHIFT       23 /* CR4.SMAP */

 #define HF_IOBPT_SHIFT      24 /* an io breakpoint enabled */

@@ -196,7 +196,7 @@ typedef enum X86Seg {

 #define HF_AC_MASK           (1 << HF_AC_SHIFT)

 #define HF_SMM_MASK          (1 << HF_SMM_SHIFT)

 #define HF_SVME_MASK         (1 << HF_SVME_SHIFT)

-#define HF_SVMI_MASK         (1 << HF_SVMI_SHIFT)

+#define HF_GUEST_MASK        (1 << HF_GUEST_SHIFT)

 #define HF_OSFXSR_MASK       (1 << HF_OSFXSR_SHIFT)

 #define HF_SMAP_MASK         (1 << HF_SMAP_SHIFT)

 #define HF_IOBPT_MASK        (1 << HF_IOBPT_SHIFT)

diff --git a/target/i386/excp_helper.c b/target/i386/excp_helper.c

index cb4d1b7..7153837 100644

--- a/target/i386/excp_helper.c

+++ b/target/i386/excp_helper.c

@@ -53,7 +53,7 @@ static int check_exception(CPUX86State *env, int intno, int *error_code,

 #if !defined(CONFIG_USER_ONLY)

     if (env->old_exception == EXCP08_DBLE) {

-        if (env->hflags & HF_SVMI_MASK) {

+        if (env->hflags & HF_GUEST_MASK) {

             cpu_vmexit(env, SVM_EXIT_SHUTDOWN, 0, retaddr); /* does not return */

         }

diff --git a/target/i386/seg_helper.c b/target/i386/seg_helper.c

index 600a4d7..f028045 100644

--- a/target/i386/seg_helper.c

+++ b/target/i386/seg_helper.c

@@ -1239,7 +1239,7 @@ static void do_interrupt_all(X86CPU *cpu, int intno, int is_int,

     }

     if (env->cr[0] & CR0_PE_MASK) {

 #if !defined(CONFIG_USER_ONLY)

-        if (env->hflags & HF_SVMI_MASK) {

+        if (env->hflags & HF_GUEST_MASK) {

             handle_even_inj(env, intno, is_int, error_code, is_hw, 0);

         }

 #endif

@@ -1254,7 +1254,7 @@ static void do_interrupt_all(X86CPU *cpu, int intno, int is_int,

         }

     } else {

 #if !defined(CONFIG_USER_ONLY)

-        if (env->hflags & HF_SVMI_MASK) {

+        if (env->hflags & HF_GUEST_MASK) {

             handle_even_inj(env, intno, is_int, error_code, is_hw, 1);

         }

 #endif

@@ -1262,7 +1262,7 @@ static void do_interrupt_all(X86CPU *cpu, int intno, int is_int,

     }

 #if !defined(CONFIG_USER_ONLY)

-    if (env->hflags & HF_SVMI_MASK) {

+    if (env->hflags & HF_GUEST_MASK) {

         CPUState *cs = CPU(cpu);

         uint32_t event_inj = x86_ldl_phys(cs, env->vm_vmcb +

                                       offsetof(struct vmcb,

diff --git a/target/i386/svm_helper.c b/target/i386/svm_helper.c

index 3504923..5b8458d 100644

--- a/target/i386/svm_helper.c

+++ b/target/i386/svm_helper.c

@@ -206,7 +206,7 @@ void helper_vmrun(CPUX86State *env, int aflag, int next_eip_addend)

                                                   ));

     /* enable intercepts */

-    env->hflags |= HF_SVMI_MASK;

+    env->hflags |= HF_GUEST_MASK;

     env->tsc_offset = x86_ldq_phys(cs, env->vm_vmcb +

                                offsetof(struct vmcb, control.tsc_offset));

@@ -481,7 +481,7 @@ void cpu_svm_check_intercept_param(CPUX86State *env, uint32_t type,

 {

     CPUState *cs = CPU(x86_env_get_cpu(env));

-    if (likely(!(env->hflags & HF_SVMI_MASK))) {

+    if (likely(!(env->hflags & HF_GUEST_MASK))) {

         return;

     }

     switch (type) {

@@ -674,7 +674,7 @@ void do_vmexit(CPUX86State *env, uint32_t exit_code, uint64_t exit_info_1)

     /* Reload the host state from vm_hsave */

     env->hflags2 &= ~(HF2_HIF_MASK | HF2_VINTR_MASK);

-    env->hflags &= ~HF_SVMI_MASK;

+    env->hflags &= ~HF_GUEST_MASK;

     env->intercept = 0;

     env->intercept_exceptions = 0;

     cs->interrupt_request &= ~CPU_INTERRUPT_VIRQ;

diff --git a/target/i386/translate.c b/target/i386/translate.c

index c9ed8dc..2a1b39e 100644

--- a/target/i386/translate.c

+++ b/target/i386/translate.c

@@ -621,7 +621,7 @@ static void gen_check_io(DisasContext *s, TCGMemOp ot, target_ulong cur_eip,

             tcg_abort();

         }

     }

-    if(s->flags & HF_SVMI_MASK) {

+    if(s->flags & HF_GUEST_MASK) {

         gen_update_cc_op(s);

         gen_jmp_im(cur_eip);

         svm_flags |= (1 << (4 + ot));

@@ -2305,7 +2305,7 @@ gen_svm_check_intercept_param(DisasContext *s, target_ulong pc_start,

                               uint32_t type, uint64_t param)

 {

     /* no SVM activated; fast case */

-    if (likely(!(s->flags & HF_SVMI_MASK)))

+    if (likely(!(s->flags & HF_GUEST_MASK)))

         return;

     gen_update_cc_op(s);

     gen_jmp_im(pc_start - s->cs_base);

-- 

1.8.3.1