[Xen-changelog] [xen master] x86 / p2m: replace page_list check in p2m_alloc_table...

[patchbot@xxxxxxx]

commit 15b6242230ba1cf92c774ad2b14f4f25411aa644
Author:     Paul Durrant <paul@xxxxxxx>
AuthorDate: Tue Mar 10 17:06:09 2020 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Mar 10 17:06:09 2020 +0100

    x86 / p2m: replace page_list check in p2m_alloc_table...
    
    ... with a check of domain_tot_pages().
    
    The check of page_list prevents the prior allocation of PGC_extra pages,
    whereas what the code is trying to verify is that the toolstack has not
    already RAM for the domain.
    
    Signed-off-by: Paul Durrant <paul@xxxxxxx>
    Reviewed-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/x86/mm/p2m.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c
index 3719deae77..9f51370327 100644
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -695,8 +695,7 @@ int p2m_alloc_table(struct p2m_domain *p2m)
 
     p2m_lock(p2m);
 
-    if ( p2m_is_hostp2m(p2m)
-         && !page_list_empty(&d->page_list) )
+    if ( p2m_is_hostp2m(p2m) && domain_tot_pages(d) )
     {
         P2M_ERROR("dom %d already has memory allocated\n", d->domain_id);
         p2m_unlock(p2m);
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog