diff options
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | configure | 13 |
3 files changed, 15 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index cad58b9487..8206fc51db 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -408,7 +408,7 @@ M: Paul Durrant <paul.durrant@citrix.com> L: xen-devel@lists.xenproject.org S: Supported F: */xen* -F: hw/9pfs/xen-9p-backend.c +F: hw/9pfs/xen-9p* F: hw/char/xen_console.c F: hw/display/xenfb.c F: hw/net/xen_nic.c @@ -1498,6 +1498,7 @@ virtio-9p M: Greg Kurz <groug@kaod.org> S: Supported F: hw/9pfs/ +X: hw/9pfs/xen-9p* F: fsdev/ F: tests/virtio-9p-test.c T: git https://github.com/gkurz/qemu.git 9p-next diff --git a/Makefile b/Makefile index cfb18f1525..c62594445d 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,9 @@ # Makefile for QEMU. +ifneq ($(words $(subst :, ,$(CURDIR))), 1) + $(error main directory cannot contain spaces nor colons) +endif + # Always point to the root of the build tree (needs GNU make). BUILD_DIR=$(CURDIR) diff --git a/configure b/configure index 5c7914570e..f2cb9f3c66 100755 --- a/configure +++ b/configure @@ -276,10 +276,15 @@ ld_has() { $ld --help 2>/dev/null | grep ".$1" >/dev/null 2>&1 } -# default parameters -source_path=$(dirname "$0") # make source path absolute -source_path=$(cd "$source_path"; pwd) +source_path=$(cd "$(dirname -- "$0")"; pwd) + +if printf %s\\n "$source_path" "$PWD" | grep -q "[[:space:]:]"; +then + error_exit "main directory cannot contain spaces nor colons" +fi + +# default parameters cpu="" iasl="iasl" interp_prefix="/usr/gnemul/qemu-%M" @@ -5130,7 +5135,7 @@ fi sem_timedwait=no cat > $TMPC << EOF #include <semaphore.h> -int main(void) { return sem_timedwait(0, 0); } +int main(void) { sem_t s; struct timespec t = {0}; return sem_timedwait(&s, &t); } EOF if compile_prog "" "" ; then sem_timedwait=yes |