| Message ID | 1378869109-14128-1-git-send-email-yzt356@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 On Wed, Sep 11, 2013 at 11:11 AM, Arthur Chunqi Li <yzt356@gmail.com> wrote: > This patch just contains two minor changes to EPT framwork. > 1. Reorder macro definition > 2. Fix bug of setting CPU_EPT without check. > > Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com> > --- > x86/vmx.h | 2 +- > x86/vmx_tests.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/x86/vmx.h b/x86/vmx.h > index e02183f..dc1ebdf 100644 > --- a/x86/vmx.h > +++ b/x86/vmx.h > @@ -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, > }; > > diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c > index e891a9f..0759e10 100644 > --- a/x86/vmx_tests.c > +++ b/x86/vmx_tests.c > @@ -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 > -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Il 11/09/2013 05:15, Arthur Chunqi Li ha scritto: > 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 -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/x86/vmx.h b/x86/vmx.h index e02183f..dc1ebdf 100644 --- a/x86/vmx.h +++ b/x86/vmx.h @@ -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, }; diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index e891a9f..0759e10 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -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();
This patch just contains two minor changes to EPT framwork. 1. Reorder macro definition 2. Fix bug of setting CPU_EPT without check. Signed-off-by: Arthur Chunqi Li <yzt356@gmail.com> --- x86/vmx.h | 2 +- x86/vmx_tests.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)