[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 22/33] target/i386: merge SVM_NPTEXIT_* with PF_ERROR_* constants
From: |
Paolo Bonzini |
Subject: |
[PULL 22/33] target/i386: merge SVM_NPTEXIT_* with PF_ERROR_* constants |
Date: |
Tue, 11 May 2021 04:13:39 -0400 |
They are the same value, and are so by design.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/svm.h | 5 -----
target/i386/tcg/sysemu/excp_helper.c | 10 +++++-----
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/target/i386/svm.h b/target/i386/svm.h
index ae30fc6f79..b515b5ced4 100644
--- a/target/i386/svm.h
+++ b/target/i386/svm.h
@@ -137,11 +137,6 @@
#define SVM_NPT_NXE (1 << 2)
#define SVM_NPT_PSE (1 << 3)
-#define SVM_NPTEXIT_P (1ULL << 0)
-#define SVM_NPTEXIT_RW (1ULL << 1)
-#define SVM_NPTEXIT_US (1ULL << 2)
-#define SVM_NPTEXIT_RSVD (1ULL << 3)
-#define SVM_NPTEXIT_ID (1ULL << 4)
#define SVM_NPTEXIT_GPA (1ULL << 32)
#define SVM_NPTEXIT_GPT (1ULL << 33)
diff --git a/target/i386/tcg/sysemu/excp_helper.c
b/target/i386/tcg/sysemu/excp_helper.c
index 1fcac51a32..7697fa4adc 100644
--- a/target/i386/tcg/sysemu/excp_helper.c
+++ b/target/i386/tcg/sysemu/excp_helper.c
@@ -205,17 +205,17 @@ static hwaddr get_hphys(CPUState *cs, hwaddr gphys,
MMUAccessType access_type,
return pte + page_offset;
do_fault_rsvd:
- exit_info_1 |= SVM_NPTEXIT_RSVD;
+ exit_info_1 |= PG_ERROR_RSVD_MASK;
do_fault_protect:
- exit_info_1 |= SVM_NPTEXIT_P;
+ exit_info_1 |= PG_ERROR_P_MASK;
do_fault:
x86_stq_phys(cs, env->vm_vmcb + offsetof(struct vmcb, control.exit_info_2),
gphys);
- exit_info_1 |= SVM_NPTEXIT_US;
+ exit_info_1 |= PG_ERROR_U_MASK;
if (access_type == MMU_DATA_STORE) {
- exit_info_1 |= SVM_NPTEXIT_RW;
+ exit_info_1 |= PG_ERROR_W_MASK;
} else if (access_type == MMU_INST_FETCH) {
- exit_info_1 |= SVM_NPTEXIT_ID;
+ exit_info_1 |= PG_ERROR_I_D_MASK;
}
if (prot) {
exit_info_1 |= SVM_NPTEXIT_GPA;
--
2.26.2
- [PULL 19/33] i386: make cpu_load_efer sysemu-only, (continued)
- [PULL 19/33] i386: make cpu_load_efer sysemu-only, Paolo Bonzini, 2021/05/11
- [PULL 20/33] accel: move call to accel_init_interfaces, Paolo Bonzini, 2021/05/11
- [PULL 23/33] target/i386: move paging mode constants from SVM to cpu.h, Paolo Bonzini, 2021/05/11
- [PULL 17/33] target/i386: gdbstub: introduce aux functions to read/write CS64 regs, Paolo Bonzini, 2021/05/11
- [PULL 14/33] i386: split svm_helper into sysemu and stub-only user, Paolo Bonzini, 2021/05/11
- [PULL 11/33] i386: move TCG bpt_helper into sysemu/, Paolo Bonzini, 2021/05/11
- [PULL 10/33] i386: split tcg excp_helper into sysemu and user parts, Paolo Bonzini, 2021/05/11
- [PULL 12/33] i386: split misc helper user stubs and sysemu part, Paolo Bonzini, 2021/05/11
- [PULL 15/33] i386: split seg_helper into user-only and sysemu parts, Paolo Bonzini, 2021/05/11
- [PULL 13/33] i386: separate fpu_helper sysemu-only parts, Paolo Bonzini, 2021/05/11
- [PULL 22/33] target/i386: merge SVM_NPTEXIT_* with PF_ERROR_* constants,
Paolo Bonzini <=
- [PULL 32/33] configure: fix detection of gdbus-codegen, Paolo Bonzini, 2021/05/11
- [PULL 26/33] target/i386: extend pg_mode to more CR0 and CR4 bits, Paolo Bonzini, 2021/05/11
- [PULL 33/33] coverity-scan: list components, move model to scripts/coverity-scan, Paolo Bonzini, 2021/05/11
- [PULL 29/33] main-loop: remove dead code, Paolo Bonzini, 2021/05/11
- [PULL 25/33] target/i386: pass cr3 to mmu_translate, Paolo Bonzini, 2021/05/11
- [PULL 24/33] target/i386: extract mmu_translate, Paolo Bonzini, 2021/05/11
- [PULL 28/33] target/i386: use mmu_translate for NPT walk, Paolo Bonzini, 2021/05/11
- [PULL 21/33] accel: add init_accel_cpu for adapting accel behavior to CPU type, Paolo Bonzini, 2021/05/11
- [PULL 27/33] target/i386: allow customizing the next phase of the translation, Paolo Bonzini, 2021/05/11
- [PULL 31/33] qemu-option: support accept-any QemuOptsList in qemu_opts_absorb_qdict, Paolo Bonzini, 2021/05/11