[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[xen master] x86/mem_sharing: Fix build with !CONFIG_XSM



commit 7372466b21c3b6c96bb7a52754e432bac883a1e3
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Thu Apr 9 21:44:11 2020 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Fri Apr 10 15:20:10 2020 +0100

    x86/mem_sharing: Fix build with !CONFIG_XSM
    
    A build fails with:
    
      mem_sharing.c: In function â??copy_special_pagesâ??:
      mem_sharing.c:1649:9: error: â??HVM_PARAM_STORE_PFNâ?? undeclared (first 
use in this function)
               HVM_PARAM_STORE_PFN,
               ^~~~~~~~~~~~~~~~~~~
      ...
    
    This is because xsm/xsm.h includes xsm/dummy.h for the !CONFIG_XSM case, 
which
    brings public/hvm/params.h in.
    
    Fixes: 41548c5472a "mem_sharing: VM forking"
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Tamas K Lengyel <tamas@xxxxxxxxxxxxx>
---
 xen/arch/x86/mm/mem_sharing.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c
index 85951b7bea..e572e9e39d 100644
--- a/xen/arch/x86/mm/mem_sharing.c
+++ b/xen/arch/x86/mm/mem_sharing.c
@@ -41,6 +41,8 @@
 #include <asm/hvm/hvm.h>
 #include <xsm/xsm.h>
 
+#include <public/hvm/params.h>
+
 #include "mm-locks.h"
 
 static shr_handle_t next_handle = 1;
--
generated by git-patchbot for /home/xen/git/xen.git#master



 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.