diff options
| author | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-10-09 20:39:01 +0000 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@eu.citrix.com> | 2013-10-09 20:39:01 +0000 |
| commit | 2f558d40911c1b8f929b8a382833ae1da5df3293 (patch) | |
| tree | 335a0f22ecb0707251c6075667e9e427ac59c946 /arch/x86/xen | |
| parent | 4a19138c6505e224d9f4cc2fe9ada9188d7100ea (diff) | |
| download | op-kernel-dev-2f558d40911c1b8f929b8a382833ae1da5df3293.zip op-kernel-dev-2f558d40911c1b8f929b8a382833ae1da5df3293.tar.gz | |
xen/x86: allow __set_phys_to_machine for autotranslate guests
Allow __set_phys_to_machine to be called for autotranslate guests.
It can be used to keep track of phys_to_machine changes, however we
don't do anything with the information at the moment.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/p2m.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index a61c7d5..2ae8699 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -799,10 +799,10 @@ bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn) { unsigned topidx, mididx, idx; - if (unlikely(xen_feature(XENFEAT_auto_translated_physmap))) { - BUG_ON(pfn != mfn && mfn != INVALID_P2M_ENTRY); + /* don't track P2M changes in autotranslate guests */ + if (unlikely(xen_feature(XENFEAT_auto_translated_physmap))) return true; - } + if (unlikely(pfn >= MAX_P2M_PFN)) { BUG_ON(mfn != INVALID_P2M_ENTRY); return true; |
