diff options
| author | Florent Thoumie <flz@FreeBSD.org> | 2005-04-15 10:20:18 +0000 |
|---|---|---|
| committer | Florent Thoumie <flz@FreeBSD.org> | 2005-04-15 10:20:18 +0000 |
| commit | 4b19291d4864f1c681afc7a01d1fa279dcc998ee (patch) | |
| tree | f0a5e212112f3461c62b1e5ca5d581b3271d068a /emulators/vmware2/files/patch-be | |
| parent | Update to 1.22 (diff) | |
- Should fix compilation and vmmon in latest 5.x.
PR: ports/68202
Submitted by: Marc van Kempen <marc@bowtie.nl>
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=133402
Diffstat (limited to 'emulators/vmware2/files/patch-be')
| -rw-r--r-- | emulators/vmware2/files/patch-be | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/emulators/vmware2/files/patch-be b/emulators/vmware2/files/patch-be index 3515097e1e04..5ae4894ac02d 100644 --- a/emulators/vmware2/files/patch-be +++ b/emulators/vmware2/files/patch-be @@ -1,5 +1,5 @@ ---- vmmon-only/freebsd/hostif.c.orig Mon Sep 2 19:19:50 2002 -+++ vmmon-only/freebsd/hostif.c Mon Sep 2 19:30:03 2002 +--- vmmon-only/freebsd/hostif.c.orig Sat Apr 10 16:52:23 2004 ++++ vmmon-only/freebsd/hostif.c Sat Apr 10 16:54:17 2004 @@ -55,7 +55,11 @@ #include <vm/vm.h> @@ -57,7 +57,33 @@ return 0; } -@@ -1066,10 +1098,33 @@ +@@ -1006,8 +1038,12 @@ + HostIF_APIC_Base(VMDriver *vm, Bool setVMPtr) + { + #if defined(SMP) ++#if __FreeBSD_version < 501114 + return cpu_apic_address; ++#else ++ return 0; /* XXX */ ++#endif + #else + return 0; + #endif + } +@@ -1035,8 +1070,12 @@ + HostIF_IOAPIC_Base(VMDriver *vm) + { + #if defined(SMP) ++#if __FreeBSD_version < 501114 + return io_apic_address[0]; /* XXX How about another APIC's */ + #else ++ return 0; /* XXX */ ++#endif ++#else + return 0; + #endif + } +@@ -1066,10 +1105,33 @@ return NULL; } paddr = vtophys(addr); @@ -91,7 +117,7 @@ return ka->kaddr; } -@@ -1079,9 +1134,29 @@ +@@ -1079,9 +1141,29 @@ if (ka->map==NULL) return 0; |