diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2008-03-21 17:31:52 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2008-03-21 17:31:52 +0000 |
| commit | e2f267539d0b5951c542e651f4672c14b5a9ac84 (patch) | |
| tree | 6bcf28c0e3e5d44254bd5667ba6ca4d296e081fc | |
| parent | - Get rid of USE_XLIB (diff) | |
- Add runtime warning when aio is not loaded
- Bump PORTREVISION
Requested by: several people on freebsd-emulation@
Notes
Notes:
svn path=/head/; revision=209544
| -rw-r--r-- | emulators/qemu-devel/Makefile | 2 | ||||
| -rw-r--r-- | emulators/qemu-devel/files/patch-vl.c | 12 | ||||
| -rw-r--r-- | emulators/qemu/Makefile | 2 | ||||
| -rw-r--r-- | emulators/qemu/files/patch-vl.c | 12 |
4 files changed, 26 insertions, 2 deletions
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile index 9a37644d2e44..550013e92b88 100644 --- a/emulators/qemu-devel/Makefile +++ b/emulators/qemu-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= qemu PORTVERSION= 0.9.1s.20080302 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://qemu.org/:release \ http://qemu-forum.ipi.fi/qemu-snapshots/:snapshot \ diff --git a/emulators/qemu-devel/files/patch-vl.c b/emulators/qemu-devel/files/patch-vl.c index 9acd842bbda6..ec763da3848a 100644 --- a/emulators/qemu-devel/files/patch-vl.c +++ b/emulators/qemu-devel/files/patch-vl.c @@ -33,3 +33,15 @@ Index: qemu/vl.c if (strstart(filename, "/dev/", NULL)) { return qemu_chr_open_tty(filename); } else +@@ -8423,6 +8423,11 @@ + nb_nics = 0; + /* default mac address of the first network interface */ + ++#ifdef __FreeBSD__ ++ if (modfind("aio") == -1) ++ fprintf(stderr, "warning: aio not (kld)loaded, may cause `Invalid system call' traps on disk IO\n"); ++#endif ++ + optind = 1; + for(;;) { + if (optind >= argc) diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 7257e8383e64..28e5d457626c 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -7,7 +7,7 @@ PORTNAME= qemu PORTVERSION= 0.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://fabrice.bellard.free.fr/qemu/:release \ http://qemu.org/:release \ diff --git a/emulators/qemu/files/patch-vl.c b/emulators/qemu/files/patch-vl.c index 8f920b047bed..a69e42ffd8ba 100644 --- a/emulators/qemu/files/patch-vl.c +++ b/emulators/qemu/files/patch-vl.c @@ -33,6 +33,18 @@ Index: qemu/vl.c if (strstart(filename, "/dev/", NULL)) { return qemu_chr_open_tty(filename); } else +@@ -8423,6 +8423,11 @@ + nb_nics = 0; + /* default mac address of the first network interface */ + ++#ifdef __FreeBSD__ ++ if (modfind("aio") == -1) ++ fprintf(stderr, "warning: aio not (kld)loaded, may cause `Invalid system call' traps on disk IO\n"); ++#endif ++ + optind = 1; + for(;;) { + if (optind >= argc) @@ -8784,6 +8784,7 @@ #ifdef TARGET_ARM case QEMU_OPTION_old_param: |