aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include
diff options
context:
space:
mode:
authorXiao Guangrong <xiaoguangrong@cn.fujitsu.com>2011-05-15 11:27:08 -0400
committerAvi Kivity <avi@redhat.com>2011-07-12 04:45:07 -0400
commit67052b3508f09956427d6476fd35e8fddde6c618 (patch)
treeb3b9585977d0fdbb746c3cf7dc41a0e24b87411e /arch/x86/include
parent53c07b18787d564a105e1aa678795d67eeb27447 (diff)
KVM: MMU: remove the arithmetic of parent pte rmap
Parent pte rmap and page rmap are very similar, so use the same arithmetic for them Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'arch/x86/include')
-rw-r--r--arch/x86/include/asm/kvm_host.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index e6a4a57e142b..ff17deb6e98b 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -227,14 +227,10 @@ struct kvm_mmu_page {
227 * in this shadow page. 227 * in this shadow page.
228 */ 228 */
229 DECLARE_BITMAP(slot_bitmap, KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS); 229 DECLARE_BITMAP(slot_bitmap, KVM_MEMORY_SLOTS + KVM_PRIVATE_MEM_SLOTS);
230 bool multimapped; /* More than one parent_pte? */
231 bool unsync; 230 bool unsync;
232 int root_count; /* Currently serving as active root */ 231 int root_count; /* Currently serving as active root */
233 unsigned int unsync_children; 232 unsigned int unsync_children;
234 union { 233 unsigned long parent_ptes; /* Reverse mapping for parent_pte */
235 u64 *parent_pte; /* !multimapped */
236 struct hlist_head parent_ptes; /* multimapped, kvm_pte_chain */
237 };
238 DECLARE_BITMAP(unsync_child_bitmap, 512); 234 DECLARE_BITMAP(unsync_child_bitmap, 512);
239}; 235};
240 236
@@ -346,7 +342,6 @@ struct kvm_vcpu_arch {
346 * put it here to avoid allocation */ 342 * put it here to avoid allocation */
347 struct kvm_pv_mmu_op_buffer mmu_op_buffer; 343 struct kvm_pv_mmu_op_buffer mmu_op_buffer;
348 344
349 struct kvm_mmu_memory_cache mmu_pte_chain_cache;
350 struct kvm_mmu_memory_cache mmu_pte_list_desc_cache; 345 struct kvm_mmu_memory_cache mmu_pte_list_desc_cache;
351 struct kvm_mmu_memory_cache mmu_page_cache; 346 struct kvm_mmu_memory_cache mmu_page_cache;
352 struct kvm_mmu_memory_cache mmu_page_header_cache; 347 struct kvm_mmu_memory_cache mmu_page_header_cache;