patchbot at xen
Aug 17, 2012, 3:55 PM
Post #1 of 1
(47 views)
Permalink
|
|
[xen-unstable] tools/python: Clean python correctly
|
|
# HG changeset patch
# User Andrew Cooper <andrew.cooper3 [at] citrix>
# Date 1345211209 -3600
# Node ID 2eae0ec993b80cab2c9469db3b9ae9a644a74ac9
# Parent b021cca938e55bb1d9fae4f1fd4df1a2d20db215
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 [at] citrix>
Acked-by: Ian Campbell <ian.campbell [at] citrix>
Committed-by: Ian Campbell <ian.campbell [at] citrix>
---
diff -r b021cca938e5 -r 2eae0ec993b8 tools/libxc/xc_linux_osdep.c
--- a/tools/libxc/xc_linux_osdep.c Fri Aug 17 14:46:48 2012 +0100
+++ b/tools/libxc/xc_linux_osdep.c Fri Aug 17 14:46:49 2012 +0100
@@ -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
{
/* Recover the VMA flags. Maybe it's not necessary */
madvise(ptr, npages * XC_PAGE_SIZE, MADV_DOFORK);
-
+
munmap(ptr, npages * XC_PAGE_SIZE);
}
diff -r b021cca938e5 -r 2eae0ec993b8 tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h Fri Aug 17 14:46:48 2012 +0100
+++ b/tools/libxc/xenctrl.h Fri Aug 17 14:46:49 2012 +0100
@@ -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,
* 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
* 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 -r b021cca938e5 -r 2eae0ec993b8 tools/python/Makefile
--- a/tools/python/Makefile Fri Aug 17 14:46:48 2012 +0100
+++ b/tools/python/Makefile Fri Aug 17 14:46:49 2012 +0100
@@ -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)
_______________________________________________
Xen-changelog mailing list
Xen-changelog [at] lists
http://lists.xensource.com/xen-changelog
|
