diff options
| author | Ingo Molnar <mingo@elte.hu> | 2007-01-05 16:36:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-05 23:55:28 -0800 |
| commit | 68a99f6d37aa65e848e09ec6ea52848e93bd5de2 (patch) | |
| tree | 28f9da432eb33364a17389dc3ce994269318837f /drivers | |
| parent | d21225ee2b6fa9f7669526927f2e0bedebd90940 (diff) | |
| download | op-kernel-dev-68a99f6d37aa65e848e09ec6ea52848e93bd5de2.zip op-kernel-dev-68a99f6d37aa65e848e09ec6ea52848e93bd5de2.tar.gz | |
[PATCH] KVM: Simplify mmu_alloc_roots()
Small optimization/cleanup:
page == page_header(page->page_hpa)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/kvm/mmu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c index 4118e50..c6f9729 100644 --- a/drivers/kvm/mmu.c +++ b/drivers/kvm/mmu.c @@ -820,9 +820,9 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu) hpa_t root = vcpu->mmu.root_hpa; ASSERT(!VALID_PAGE(root)); - root = kvm_mmu_get_page(vcpu, root_gfn, 0, - PT64_ROOT_LEVEL, 0, NULL)->page_hpa; - page = page_header(root); + page = kvm_mmu_get_page(vcpu, root_gfn, 0, + PT64_ROOT_LEVEL, 0, NULL); + root = page->page_hpa; ++page->root_count; vcpu->mmu.root_hpa = root; return; @@ -836,10 +836,10 @@ static void mmu_alloc_roots(struct kvm_vcpu *vcpu) root_gfn = vcpu->pdptrs[i] >> PAGE_SHIFT; else if (vcpu->mmu.root_level == 0) root_gfn = 0; - root = kvm_mmu_get_page(vcpu, root_gfn, i << 30, + page = kvm_mmu_get_page(vcpu, root_gfn, i << 30, PT32_ROOT_LEVEL, !is_paging(vcpu), - NULL)->page_hpa; - page = page_header(root); + NULL); + root = page->page_hpa; ++page->root_count; vcpu->mmu.pae_root[i] = root | PT_PRESENT_MASK; } |
