From: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
To: Avi Kivity <avi@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
LKML <linux-kernel@vger.kernel.org>, KVM <kvm@vger.kernel.org>
Subject: [PATCH 9/10] KVM: MMU: remove unused macros
Date: Fri, 04 Mar 2011 19:01:39 +0800 [thread overview]
Message-ID: <4D70C693.4060405@cn.fujitsu.com> (raw)
In-Reply-To: <4D70C569.1030107@cn.fujitsu.com>
These macros are not used, so removed
Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
---
arch/x86/kvm/mmu.c | 5 -----
arch/x86/kvm/paging_tmpl.h | 3 ---
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 7d558b8..54a2ead 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -111,9 +111,6 @@ module_param(oos_shadow, bool, 0644);
#define PT64_LEVEL_SHIFT(level) \
(PAGE_SHIFT + (level - 1) * PT64_LEVEL_BITS)
-#define PT64_LEVEL_MASK(level) \
- (((1ULL << PT64_LEVEL_BITS) - 1) << PT64_LEVEL_SHIFT(level))
-
#define PT64_INDEX(address, level)\
(((address) >> PT64_LEVEL_SHIFT(level)) & ((1 << PT64_LEVEL_BITS) - 1))
@@ -123,8 +120,6 @@ module_param(oos_shadow, bool, 0644);
#define PT32_LEVEL_SHIFT(level) \
(PAGE_SHIFT + (level - 1) * PT32_LEVEL_BITS)
-#define PT32_LEVEL_MASK(level) \
- (((1ULL << PT32_LEVEL_BITS) - 1) << PT32_LEVEL_SHIFT(level))
#define PT32_LVL_OFFSET_MASK(level) \
(PT32_BASE_ADDR_MASK & ((1ULL << (PAGE_SHIFT + (((level) - 1) \
* PT32_LEVEL_BITS))) - 1))
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index b3862ee..86eb816 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -31,7 +31,6 @@
#define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)
#define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)
#define PT_INDEX(addr, level) PT64_INDEX(addr, level)
- #define PT_LEVEL_MASK(level) PT64_LEVEL_MASK(level)
#define PT_LEVEL_BITS PT64_LEVEL_BITS
#ifdef CONFIG_X86_64
#define PT_MAX_FULL_LEVELS 4
@@ -48,7 +47,6 @@
#define PT_LVL_ADDR_MASK(lvl) PT32_LVL_ADDR_MASK(lvl)
#define PT_LVL_OFFSET_MASK(lvl) PT32_LVL_OFFSET_MASK(lvl)
#define PT_INDEX(addr, level) PT32_INDEX(addr, level)
- #define PT_LEVEL_MASK(level) PT32_LEVEL_MASK(level)
#define PT_LEVEL_BITS PT32_LEVEL_BITS
#define PT_MAX_FULL_LEVELS 2
#define CMPXCHG cmpxchg
@@ -827,7 +825,6 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
#undef FNAME
#undef PT_BASE_ADDR_MASK
#undef PT_INDEX
-#undef PT_LEVEL_MASK
#undef PT_LVL_ADDR_MASK
#undef PT_LVL_OFFSET_MASK
#undef PT_LEVEL_BITS
--
1.7.4
next prev parent reply other threads:[~2011-03-04 11:00 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-04 10:56 [PATCH 1/10] KVM: MMU: fix kvm_mmu_slot_remove_write_access Xiao Guangrong
2011-03-04 10:57 ` [PATCH 2/10] KVM: MMU: fix kvm_mmu_get_spte_hierarchy Xiao Guangrong
2011-03-05 16:48 ` Marcelo Tosatti
2011-03-07 3:06 ` Xiao Guangrong
2011-03-07 8:55 ` Avi Kivity
2011-03-04 10:58 ` [PATCH 3/10] KVM: MMU: set spte accessed bit properly Xiao Guangrong
2011-03-04 10:58 ` [PATCH 4/10] KVM: fix rcu usage in init_rmode_* functions Xiao Guangrong
2011-03-04 11:43 ` Jan Kiszka
2011-03-07 2:04 ` Xiao Guangrong
2011-03-04 10:59 ` [PATCH 5/10] KVM: MMU: move mmu pages calculated out of mmu lock Xiao Guangrong
2011-03-04 11:00 ` [PATCH 6/10] KVM: MMU: don not record gfn in kvm_mmu_pte_write Xiao Guangrong
2011-03-06 12:14 ` Avi Kivity
2011-03-06 12:16 ` Avi Kivity
2011-03-07 3:16 ` Xiao Guangrong
2011-03-04 11:00 ` [PATCH 7/10] KVM: MMU: introduce a common function to get no-dirty-logged slot Xiao Guangrong
2011-03-06 12:28 ` Avi Kivity
2011-03-07 3:50 ` Xiao Guangrong
2011-03-04 11:01 ` [PATCH 8/10] KVM: MMU: cleanup page alloc and free Xiao Guangrong
2011-03-04 11:01 ` Xiao Guangrong [this message]
2011-03-04 11:02 ` [PATCH 10/10] KVM: cleanup memslot_id function Xiao Guangrong
2011-03-06 12:32 ` Avi Kivity
2011-03-06 12:34 ` [PATCH 1/10] KVM: MMU: fix kvm_mmu_slot_remove_write_access Avi Kivity
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4D70C693.4060405@cn.fujitsu.com \
--to=xiaoguangrong@cn.fujitsu.com \
--cc=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mtosatti@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.