Subject: Re: vmware modules on current?
To: None <current-users@netbsd.org>
From: Juergen Hannken-Illjes <hannken@eis.cs.tu-bs.de>
List: current-users
Date: 02/23/2003 14:54:22
On Sun, Feb 23, 2003 at 01:47:42PM +0000, Rasputin wrote:
>
> I can't seem to build vmware-module from pkgsrc on a recentish CURRENT (1.6O) -
> anyone know why?
You could try this one:
--- source/vmmon/include/x86.h.orig Mon Jan 27 16:17:49 2003
+++ source/vmmon/include/x86.h Mon Jan 27 16:21:32 2003
@@ -181,7 +181,13 @@
#endif /* MSR_TSC */
#define MSR_MTRR_CAP 0x000000fe
+#ifndef MSR_SYSENTER_CS
#define MSR_SYSENTER_CS 0x00000174
+#endif /* MSR_SYSENTER_CS */
+#ifndef MSR_SYSENTER_ESP
#define MSR_SYSENTER_ESP 0x00000175
+#endif /* MSR_SYSENTER_ESP */
+#ifndef MSR_SYSENTER_EIP
#define MSR_SYSENTER_EIP 0x00000176
+#endif /* MSR_SYSENTER_EIP */
--- source/vmmon/netbsd/drv.c.orig Mon Jan 27 16:17:49 2003
+++ source/vmmon/netbsd/drv.c Mon Jan 27 16:26:51 2003
@@ -666,5 +666,5 @@
* XXX
*/
- if (curproc == NULL) {
+ if (curlwp == NULL) {
printf("vmmon: Panic in interruptn\n");
panic("Assertion failure in interrupt handling in VMX86\n");
@@ -680,5 +680,5 @@
}
- exit1(curproc, 0);
+ exit1(curlwp, 0);
/* NOTREACHED */
}
--- source/vmmon/netbsd/host.c.orig Mon Jan 27 16:17:49 2003
+++ source/vmmon/netbsd/host.c Mon Jan 27 16:28:38 2003
@@ -636,5 +636,5 @@
Warning("KernelAddr already allocated\n");
- PHOLD(curproc);
+ PHOLD(curlwp);
uvm_vslock(curproc, addr, PAGE_SIZE,
VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE);
@@ -645,5 +645,5 @@
pmap_kenter_pa(kvaddr, paddr,
VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE);
- PRELE(curproc);
+ PRELE(curlwp);
vm->crossvaddr = (void *)kvaddr;
vm->crossuaddr = addr;
--
Juergen Hannken-Illjes - hannken@eis.cs.tu-bs.de - TU Braunschweig (Germany)