mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00
Code Issues Releases Activity

- Update to 1.4.0.p1 after repocopy from kqemu-kmod, this version is

Browse Source 
needed for qemu svn and the experimental qemu-devel update available at:
	http://people.freebsd.org/~nox/qemu/qemu-devel-20080620.patch
  (see
	http://docs.freebsd.org/cgi/mid.cgi?20080620211216.GA75382
  for the original announcement.)
- Add CONFLICTS with the kqemu-kmod port.
- Add D_NEEDMINOR as now required on -current for drivers that use the
  cloner library:
	http://svn.freebsd.org/viewvc/base?view=revision&revision=179726
  (this last item was not yet in the original shar I put up for testing.)
This commit is contained in:
Juergen Lock 2008-06-22 22:06:15 +00:00
parent 1b6f967d94
commit 443c9e6d2c
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=215563
3 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emulators/kqemu-kmod-devel/Makefile
View File

@ -6,14 +6,13 @@
#
PORTNAME= kqemu
PORTVERSION= 1.3.0.p11
PORTREVISION= 8
PORTVERSION= 1.4.0.p1
CATEGORIES= emulators kld
MASTER_SITES= http://bellard.org/qemu/ \
http://qemu.org/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= nox
PKGNAMESUFFIX= -kmod
PKGNAMESUFFIX= -kmod-devel
DISTNAME= ${PORTNAME}-${PORTVERSION:C/.p/pre/}
DIST_SUBDIR= kqemu
@ -24,6 +23,7 @@ ONLY_FOR_ARCHS= i386 amd64
HAS_CONFIGURE= yes
USE_GMAKE= yes
CONFIGURE_ARGS+= --prefix=${PREFIX} --cc=${CC}
CONFLICTS= kqemu-kmod-[0-9]*
USE_RC_SUBR= kqemu

6
emulators/kqemu-kmod-devel/distinfo
View File

@ -1,3 +1,3 @@
MD5 (kqemu/kqemu-1.3.0pre11.tar.gz) = 970521874ef8b1ba4598925ace5936c3
SHA256 (kqemu/kqemu-1.3.0pre11.tar.gz) = 541aef5797e5c6c6a76e354c17c6513ca21fe3372ec79493a32f7e51ba785b0f
SIZE (kqemu/kqemu-1.3.0pre11.tar.gz) = 161478
MD5 (kqemu/kqemu-1.4.0pre1.tar.gz) = d738d8ca7332211ab716ec3213d82ee1
SHA256 (kqemu/kqemu-1.4.0pre1.tar.gz) = bac3e84eae1c867b06cd06ed2bcf563ba8304bd4e5a900880c2abe61b9aab491
SIZE (kqemu/kqemu-1.4.0pre1.tar.gz) = 168249

46
emulators/kqemu-kmod-devel/files/patch-kqemu-freebsd.c
View File

@ -1,5 +1,5 @@
Index: kqemu-freebsd.c
@@ -208,9 +208,17 @@
@@ -222,9 +222,17 @@
int CDECL kqemu_schedule(void)
{
/* kqemu_log("kqemu_schedule\n"); */
@ -17,7 +17,27 @@ Index: kqemu-freebsd.c
return SIGPENDING(curthread);
}
#endif
@@ -320,8 +328,15 @@
@@ -258,6 +266,10 @@
static struct clonedevs *kqemuclones;
static TAILQ_HEAD(,kqemu_instance) kqemuhead = TAILQ_HEAD_INITIALIZER(kqemuhead);
static eventhandler_tag clonetag;
+#ifndef D_NEEDMINOR
+/* see http://svn.freebsd.org/viewvc/base?view=revision&revision=179726 */
+#define D_NEEDMINOR 0
+#endif
#endif
static d_close_t kqemu_close;
@@ -282,7 +294,7 @@
/* bmaj */ -1
#else
.d_version = D_VERSION,
- .d_flags = D_NEEDGIANT,
+ .d_flags = D_NEEDGIANT | D_NEEDMINOR,
.d_open = kqemu_open,
.d_ioctl = kqemu_ioctl,
.d_close = kqemu_close,
@@ -334,8 +346,15 @@
#if __FreeBSD_version >= 500000
dev->si_drv1 = NULL;
TAILQ_REMOVE(&kqemuhead, ks, kqemu_ent);
@ -33,7 +53,27 @@ Index: kqemu-freebsd.c
free(ks, M_KQEMU);
--kqemu_ref_count;
}
@@ -500,7 +515,13 @@
@@ -412,6 +431,19 @@
ks->state = s;
break;
}
+ case KQEMU_SET_PHYS_MEM: {
+ struct kqemu_phys_mem kphys_mem;
+ if (!s) {
+ ret = -EIO;
+ break;
+ }
+ kphys_mem = *(struct kqemu_phys_mem *)addr;
+ ret = kqemu_set_phys_mem(s, &kphys_mem);
+ if (ret != 0) {
+ ret = -EINVAL;
+ }
+ break;
+ }
case KQEMU_EXEC: {
struct kqemu_cpu_state *ctx;
if (s == NULL) {
@@ -514,7 +546,13 @@
while ((ks = TAILQ_FIRST(&kqemuhead)) != NULL) {
kqemu_destroy(ks);
}