]> xenbits.xensource.com Git - people/sstabellini/xen-unstable.git/.git/commitdiff
x86/mem_sharing: Fix build with !CONFIG_XSM
authorAndrew Cooper <andrew.cooper3@citrix.com>
Thu, 9 Apr 2020 20:44:11 +0000 (21:44 +0100)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Fri, 10 Apr 2020 14:20:10 +0000 (15:20 +0100)
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@citrix.com>
Acked-by: Tamas K Lengyel <tamas@tklengyel.com>
xen/arch/x86/mm/mem_sharing.c

index 85951b7bea03abb0e56f328c1aaa7443e93bbba8..e572e9e39dd3d6e4a65e040cb68cbaae2d024e41 100644 (file)
@@ -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;