tools/python: Clean python correctly

Cleaning the python directory should completely remove the build/
directory, otherwise subsequent builds may be short-circuited and a
stale build installed.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c
index 33fdba3605d526066b8d02fcbcbe6557ebccce1f..787e74285ebfa5918a528714afca571a9338cbdb 100644 (file)
--- a/tools/libxc/xc_linux_osdep.c
+++ b/tools/libxc/xc_linux_osdep.c
@@ -1,4 +1,4 @@
-/******************************************************************************
+ /******************************************************************************
  *
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -106,7 +106,7 @@ static void linux_privcmd_free_hypercall_buffer(xc_interface *xch, xc_osdep_hand
 {
     /* Recover the VMA flags. Maybe it's not necessary */
     madvise(ptr, npages * XC_PAGE_SIZE, MADV_DOFORK);
-    
+
     munmap(ptr, npages * XC_PAGE_SIZE);
 }
 

diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h
index f5583fbab6bd42c154870d6cf2a2a7d044f25b4c..b7741ca543ea024974a00b8803d937ccf428ce4f 100644 (file)
--- a/tools/libxc/xenctrl.h
+++ b/tools/libxc/xenctrl.h
@@ -135,10 +135,9 @@ typedef enum xc_error_code xc_error_code;
  * have an open hypervisor interface at the same time.
  *
  * Note:
- * Child processes must not use the opened xc interface handle that inherits
- * from parents. They should reopen the handle if they want to interact with
- * xc. Otherwise, it may cause segment fault to access hypercall buffer caches
- * of the handle.
+ * After fork a child process must not use any opened xc interface
+ * handle inherited from their parent. They must open a new handle if
+ * they want to interact with xc.
  *
  * Each call to this function should have a corresponding call to
  * xc_interface_close().
@@ -915,10 +914,9 @@ int xc_evtchn_status(xc_interface *xch, xc_evtchn_status_t *status);
  * errno will be set appropriately.
  *
  * Note:
- * Child processes must not use the opened xc evtchn handle that inherits from
- * parents. They should reopen the handle if they want to interact with xc.
- * Otherwise, it may cause segment fault to access hypercall buffer caches of
- * the handle.
+ * After fork a child process must not use any opened xc evtchn
+ * handle inherited from their parent. They must open a new handle if
+ * they want to interact with xc.
  *
  * Before Xen pre-4.1 this function would sometimes report errors with perror.
  */
@@ -1351,12 +1349,13 @@ int xc_domain_subscribe_for_suspend(
 
 /*
  * These functions sometimes log messages as above, but not always.
- *
+ */
+
+/*
  * Note:
- * Child processes must not use the opened xc gnttab handle that inherits from
- * parents. They should reopen the handle if they want to interact with xc.
- * Otherwise, it may cause segment fault to access hypercall buffer caches of
- * the handle.
+ * After fork a child process must not use any opened xc gnttab
+ * handle inherited from their parent. They must open a new handle if
+ * they want to interact with xc.
  *
  * Return an fd onto the grant table driver.  Logs errors.
  */
@@ -1476,10 +1475,9 @@ grant_entry_v2_t *xc_gnttab_map_table_v2(xc_interface *xch, int domid, int *gnt_
  * Return an fd onto the grant sharing driver.  Logs errors.
  *
  * Note:
- * Child processes must not use the opened xc gntshr handle that inherits from
- * parents. They should reopen the handle if they want to interact with xc.
- * Otherwise, it may cause segment fault to access hypercall buffer caches of
- * the handle.
+ * After fork a child process must not use any opened xc gntshr
+ * handle inherited from their parent. They must open a new handle if
+ * they want to interact with xc.
  *
  */
 xc_gntshr *xc_gntshr_open(xentoollog_logger *logger,

diff --git a/tools/python/Makefile b/tools/python/Makefile
index d2cbf70836e0c27becfbbe2445399484b7d5fb1c..9be11225fa6676b9383dbb59eb5e060e69a10f87 100644 (file)
--- a/tools/python/Makefile
+++ b/tools/python/Makefile
@@ -34,7 +34,7 @@ test:
 .PHONY: clean
 clean:
        rm -f $(XENPATH)
-       rm -rf *.pyc *.pyo *.o *.a *~ xen/util/auxbin.pyc
+       rm -rf build/ *.pyc *.pyo *.o *.a *~ xen/util/auxbin.pyc
        rm -f xen/lowlevel/xl/_pyxl_types.h
        rm -f xen/lowlevel/xl/_pyxl_types.c
        rm -f $(DEPS)