diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 17:40:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-07-01 17:40:32 +0100 |
| commit | 7d0e02405fc02a181319b1ab8681d2f72246b7c6 (patch) | |
| tree | 94ba08635a483d7e85e588ae5182fcf0285aff60 | |
| parent | 5e6ebacc3b1e4e8d52a27b9f236fdc01d828641c (diff) | |
| parent | b827891d73778eaf962b0536f955194cf4faa424 (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-patches-pull-request' into staging
configure improvements and fixes
MAINTAINERS update
# gpg: Signature made Wed 26 Jun 2019 21:02:10 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/trivial-patches-pull-request:
MAINTAINERS: Change maintership of Xen code under hw/9pfs
configure: use valid args testing sem_timedwait
configure: disallow spaces and colons in source path and build path
configure: set source_path only once and make its definition more robust
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -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 @@ -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) @@ -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 |