From b67f7b83ab2bcf7194e52ebd8b277fdcddc75a6b Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 17 Aug 2012 14:46:49 +0100 Subject: 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 Acked-by: Ian Campbell Committed-by: Ian Campbell --- tools/libxc/xc_linux_osdep.c | 4 ++-- tools/libxc/xenctrl.h | 32 +++++++++++++++----------------- tools/python/Makefile | 2 +- 3 files changed, 18 insertions(+), 20 deletions(-) diff --git a/tools/libxc/xc_linux_osdep.c b/tools/libxc/xc_linux_osdep.c index 33fdba3605..787e74285e 100644 --- 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 f5583fbab6..b7741ca543 100644 --- 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 d2cbf70836..9be11225fa 100644 --- 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) -- cgit v1.2.3