diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2005-10-07 19:26:21 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2005-10-07 19:26:21 +0000 |
| commit | edfcbac53b2bc96a138f8981815431a27d2d4594 (patch) | |
| tree | 8a765304f4b369101c994065a7b148963991e169 /emulators/qemu/files | |
| parent | Update to 1.0 (diff) | |
- Now compiles with system compiler on amd64 again (Klaus-J. Wolf)
- Fix bogus EBUSY with /dev/kqemu on 5+ (Manuel Stuehn)
PR: ports/86617, ports/87086
Submitted by: Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=144522
Diffstat (limited to 'emulators/qemu/files')
| -rw-r--r-- | emulators/qemu/files/kqemu-freebsd-patch | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/emulators/qemu/files/kqemu-freebsd-patch b/emulators/qemu/files/kqemu-freebsd-patch index 85fe0db0eb09..18bc371df0dc 100644 --- a/emulators/qemu/files/kqemu-freebsd-patch +++ b/emulators/qemu/files/kqemu-freebsd-patch @@ -236,7 +236,7 @@ Index: qemu/kqemu/kqemu-freebsd.c static char log_buf[4096]; -@@ -176,47 +227,155 @@ +@@ -176,47 +227,159 @@ va_end(ap); } @@ -359,7 +359,11 @@ Index: qemu/kqemu/kqemu-freebsd.c +#endif struct kqemu_instance *ks; + ++#if __FreeBSD_version >= 500000 ++ if (kqemu_ref_count >= KQEMU_MAX_INSTANCES) ++#else + if (dev->si_drv1 || kqemu_ref_count >= KQEMU_MAX_INSTANCES) ++#endif + return(EBUSY); + + if ((flags & (FREAD|FWRITE)) == FREAD) @@ -397,7 +401,7 @@ Index: qemu/kqemu/kqemu-freebsd.c { int error = 0; int ret; -@@ -231,8 +390,9 @@ +@@ -231,8 +394,9 @@ break; } d1 = *(struct kqemu_init *)addr; @@ -409,7 +413,7 @@ Index: qemu/kqemu/kqemu-freebsd.c if (s == NULL) { error = ENOMEM; break; -@@ -248,9 +408,16 @@ +@@ -248,9 +412,16 @@ } ctx = kqemu_get_cpu_state(s); *ctx = *(struct kqemu_cpu_state *)addr; @@ -426,7 +430,7 @@ Index: qemu/kqemu/kqemu-freebsd.c *(struct kqemu_cpu_state *)addr = *ctx; break; } -@@ -265,10 +432,22 @@ +@@ -265,10 +436,22 @@ /* ARGSUSED */ static int @@ -450,7 +454,7 @@ Index: qemu/kqemu/kqemu-freebsd.c } /* ARGSUSED */ -@@ -276,15 +455,55 @@ +@@ -276,15 +459,55 @@ kqemu_modevent(module_t mod __unused, int type, void *data __unused) { int error = 0; |