kvm-unit-tests: VMX: Fix two minor bugs
PATCH 1/1 kvm-unit-tests: VMX: Fix two minor bugs
This patch just contains two minor changes to EPT framwork.
1. Reorder macro definition
2. Fix bug of setting CPU_EPT without check.
--- x86/vmx.h | 2 +- x86/vmx_tests.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
x86/vmx.h +1 -1
@@ -366,9 +366,9 @@ enum Ctrl0 {CPU_NMI_WINDOW =1ul <<22 ,CPU_IO =1ul <<24 ,CPU_IO_BITMAP =1ul <<25 , +CPU_MSR_BITMAP =1ul <<28 ,CPU_MONITOR =1ul <<29 ,CPU_PAUSE =1ul <<30 , -CPU_MSR_BITMAP =1ul <<28 , CPU_SECONDARY = 1ul << 31, };
x86/vmx_tests.c +1 -1
@@ -925,7 +925,7 @@ static void ept_init() ctrl_cpu[1 ] = (ctrl_cpu[1 ] |CPU_EPT ) & ctrl_cpu_rev[1 ].clr;vmcs_write (CPU_EXEC_CTRL0 , ctrl_cpu[0 ]); -vmcs_write (CPU_EXEC_CTRL1 , ctrl_cpu[1 ] |CPU_EPT ); +vmcs_write (CPU_EXEC_CTRL1 , ctrl_cpu[1 ]);if (setup_ept ()) init_fail = true; data_page1 =alloc_page ();
Signature · 1 line
1.7.9.5
Hi Paolo,
Sorry but I should trouble you merging these two minor changes to vmx branch.
Until now, all the commits in vmx branch seems fine (if others have no comments). Because I have some patches to commit based on vmx branch, should we merge this branch to master or I just commit patches based on vmx?
Thanks,
Arthur
Quoted 41 lines · Arthur Chunqi Li
This patch just contains two minor changes to EPT framwork.
1. Reorder macro definition
2. Fix bug of settingCPU_EPTwithout check.Signed-off-by Arthur Chunqi Li <[email protected]>--- x86/vmx.h | 2 +- x86/vmx_tests.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)x86/vmx.h +1
-1@@ -366,9 +366,9 @@ enum Ctrl0 {CPU_NMI_WINDOW =1ul <<22 ,CPU_IO =1ul <<24 ,CPU_IO_BITMAP =1ul <<25 , +CPU_MSR_BITMAP =1ul <<28 ,CPU_MONITOR =1ul <<29 ,CPU_PAUSE =1ul <<30 , -CPU_MSR_BITMAP =1ul <<28 , CPU_SECONDARY = 1ul << 31, };x86/vmx_tests.c +1
-2@@ -925,7 +925,7 @@ static void ept_init() ctrl_cpu[1 ] = (ctrl_cpu[1 ] |CPU_EPT ) & ctrl_cpu_rev[1 ].clr;vmcs_write (CPU_EXEC_CTRL0 , ctrl_cpu[0 ]); -vmcs_write (CPU_EXEC_CTRL1 , ctrl_cpu[1 ] |CPU_EPT ); +vmcs_write (CPU_EXEC_CTRL1 , ctrl_cpu[1 ]);if (setup_ept ()) init_fail = true; data_page1 =alloc_page (); --1.7.9.5
Paolo Bonzini
maintainerIl 11/09/2013 05:15, Arthur Chunqi Li ha scritto:
Quoted 8 lines
Hi Paolo,
Sorry but I should trouble you merging these two minor changes to vmx branch.
Until now, all the commits in vmx branch seems fine (if others have no comments). Because I have some patches to commit based on vmx branch, should we merge this branch to master or I just commit patches based on vmx?
Please send patches based on vmx, otherwise review becomes very very hard. When everything is ready, we'll squash the fixes and merge to master. Until then, vmx will _not_ be rebased so you can use it for development.
Paolo