aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm/mmu.c
diff options
context:
space:
mode:
authorMike Day <ncmike@ncultra.org>2007-10-08 09:02:08 -0400
committerAvi Kivity <avi@qumranet.com>2008-01-30 10:52:50 -0500
commitd77c26fce93d07802db97498959587eb9347b31d (patch)
treeed49397152d9a8c2ce3dda751a235283f07ef220 /drivers/kvm/mmu.c
parent7e620d16b8838bc0ad5b27d2dd55796270cd588c (diff)
KVM: CodingStyle cleanup
Signed-off-by: Mike D. Day <ncmike@ncultra.org> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/mmu.c')
-rw-r--r--drivers/kvm/mmu.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/kvm/mmu.c b/drivers/kvm/mmu.c
index 6cda1feb9a95..ece0aa4e4c9f 100644
--- a/drivers/kvm/mmu.c
+++ b/drivers/kvm/mmu.c
@@ -90,7 +90,8 @@ static int dbg = 1;
90 90
91#define PT32_DIR_PSE36_SIZE 4 91#define PT32_DIR_PSE36_SIZE 4
92#define PT32_DIR_PSE36_SHIFT 13 92#define PT32_DIR_PSE36_SHIFT 13
93#define PT32_DIR_PSE36_MASK (((1ULL << PT32_DIR_PSE36_SIZE) - 1) << PT32_DIR_PSE36_SHIFT) 93#define PT32_DIR_PSE36_MASK \
94 (((1ULL << PT32_DIR_PSE36_SIZE) - 1) << PT32_DIR_PSE36_SHIFT)
94 95
95 96
96#define PT_FIRST_AVAIL_BITS_SHIFT 9 97#define PT_FIRST_AVAIL_BITS_SHIFT 9
@@ -103,7 +104,7 @@ static int dbg = 1;
103#define PT64_LEVEL_BITS 9 104#define PT64_LEVEL_BITS 9
104 105
105#define PT64_LEVEL_SHIFT(level) \ 106#define PT64_LEVEL_SHIFT(level) \
106 ( PAGE_SHIFT + (level - 1) * PT64_LEVEL_BITS ) 107 (PAGE_SHIFT + (level - 1) * PT64_LEVEL_BITS)
107 108
108#define PT64_LEVEL_MASK(level) \ 109#define PT64_LEVEL_MASK(level) \
109 (((1ULL << PT64_LEVEL_BITS) - 1) << PT64_LEVEL_SHIFT(level)) 110 (((1ULL << PT64_LEVEL_BITS) - 1) << PT64_LEVEL_SHIFT(level))
@@ -115,7 +116,7 @@ static int dbg = 1;
115#define PT32_LEVEL_BITS 10 116#define PT32_LEVEL_BITS 10
116 117
117#define PT32_LEVEL_SHIFT(level) \ 118#define PT32_LEVEL_SHIFT(level) \
118 ( PAGE_SHIFT + (level - 1) * PT32_LEVEL_BITS ) 119 (PAGE_SHIFT + (level - 1) * PT32_LEVEL_BITS)
119 120
120#define PT32_LEVEL_MASK(level) \ 121#define PT32_LEVEL_MASK(level) \
121 (((1ULL << PT32_LEVEL_BITS) - 1) << PT32_LEVEL_SHIFT(level)) 122 (((1ULL << PT32_LEVEL_BITS) - 1) << PT32_LEVEL_SHIFT(level))
@@ -1489,7 +1490,8 @@ static void audit_mappings_page(struct kvm_vcpu *vcpu, u64 page_pte,
1489 printk(KERN_ERR "xx audit error: (%s) levels %d" 1490 printk(KERN_ERR "xx audit error: (%s) levels %d"
1490 " gva %lx gpa %llx hpa %llx ent %llx %d\n", 1491 " gva %lx gpa %llx hpa %llx ent %llx %d\n",
1491 audit_msg, vcpu->mmu.root_level, 1492 audit_msg, vcpu->mmu.root_level,
1492 va, gpa, hpa, ent, is_shadow_present_pte(ent)); 1493 va, gpa, hpa, ent,
1494 is_shadow_present_pte(ent));
1493 else if (ent == shadow_notrap_nonpresent_pte 1495 else if (ent == shadow_notrap_nonpresent_pte
1494 && !is_error_hpa(hpa)) 1496 && !is_error_hpa(hpa))
1495 printk(KERN_ERR "audit: (%s) notrap shadow," 1497 printk(KERN_ERR "audit: (%s) notrap shadow,"