aboutsummaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2010-11-16 07:42:44 +0000
committerMartin Blapp <mbr@FreeBSD.org>2010-11-16 07:42:44 +0000
commite189332abbd65b46a0491a02885dafb73c11c738 (patch)
treef691eb72f79bdccb8c77315ad5d69629ee4d9245 /emulators
parent8a6e3fb2422982fdc027888800dcefcbaed7d2c8 (diff)
Notes
Diffstat (limited to 'emulators')
-rw-r--r--emulators/open-vm-tools/files/patch-vmhgfs-kernelStubs.h11
-rw-r--r--emulators/open-vm-tools/files/patch-vmhgfs-state.c20
-rw-r--r--emulators/open-vm-tools/files/patch-vmhgfs-vnopscommon.c11
3 files changed, 40 insertions, 2 deletions
diff --git a/emulators/open-vm-tools/files/patch-vmhgfs-kernelStubs.h b/emulators/open-vm-tools/files/patch-vmhgfs-kernelStubs.h
new file mode 100644
index 000000000000..e61b05b8073d
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-vmhgfs-kernelStubs.h
@@ -0,0 +1,11 @@
+--- modules/freebsd/vmhgfs/kernelStubs.h.orig 2010-10-20 05:19:54.000000000 +0900
++++ modules/freebsd/vmhgfs/kernelStubs.h 2010-11-16 13:26:24.000000000 +0900
+@@ -132,7 +132,7 @@
+ * Stub functions we provide.
+ */
+
+-void Panic(const char *fmt, ...);
++/* void Panic(const char *fmt, ...); -> vm_assert.h */
+
+ char *Str_Strcpy(char *buf, const char *src, size_t maxSize);
+ int Str_Vsnprintf(char *str, size_t size, const char *format,
diff --git a/emulators/open-vm-tools/files/patch-vmhgfs-state.c b/emulators/open-vm-tools/files/patch-vmhgfs-state.c
index 1efee0c81025..b718e2b93b75 100644
--- a/emulators/open-vm-tools/files/patch-vmhgfs-state.c
+++ b/emulators/open-vm-tools/files/patch-vmhgfs-state.c
@@ -1,5 +1,5 @@
---- modules/freebsd/vmhgfs/state.c.orig 2009-02-28 23:06:10.000000000 +0100
-+++ modules/freebsd/vmhgfs/state.c 2009-02-28 23:08:59.000000000 +0100
+--- modules/freebsd/vmhgfs/state.c.orig 2010-10-20 05:19:54.000000000 +0900
++++ modules/freebsd/vmhgfs/state.c 2010-11-16 13:27:57.000000000 +0900
@@ -770,6 +770,12 @@
goto destroyVnode;
}
@@ -13,3 +13,19 @@
/*
* Now we'll initialize the vnode. We need to set the file type, vnode
* operations, flags, filesystem pointer, reference count, and device.
+@@ -1277,6 +1283,7 @@
+ *----------------------------------------------------------------------------
+ */
+
++#if 0 /* never used */
+ void
+ HgfsMarkFileMmapped(struct vnode *vp, // vnode which state is being changed
+ Bool mmapped) // New mapping state
+@@ -1286,6 +1293,7 @@
+ fp = HGFS_VP_TO_FP(vp);
+ fp->mmapped = mmapped;
+ }
++#endif
+
+ /* Adding/finding/removing file state from hash table */
+
diff --git a/emulators/open-vm-tools/files/patch-vmhgfs-vnopscommon.c b/emulators/open-vm-tools/files/patch-vmhgfs-vnopscommon.c
new file mode 100644
index 000000000000..4679050f559a
--- /dev/null
+++ b/emulators/open-vm-tools/files/patch-vmhgfs-vnopscommon.c
@@ -0,0 +1,11 @@
+--- modules/freebsd/vmhgfs/vnopscommon.c.orig 2010-10-20 05:19:54.000000000 +0900
++++ modules/freebsd/vmhgfs/vnopscommon.c 2010-11-16 13:26:55.000000000 +0900
+@@ -50,7 +50,7 @@
+ static int HgfsDoGetattrInt(const char *path, const HgfsHandle handle, HgfsSuperInfo *sip,
+ HgfsAttrV2 *hgfsAttrV2);
+ static int HgfsDoGetattrByName(const char *path, HgfsSuperInfo *sip, HgfsAttrV2 *hgfsAttrV2);
+-int HgfsReadlinkInt(struct vnode *vp, struct uio *uiop);
++/* int HgfsReadlinkInt(struct vnode *vp, struct uio *uiop); -> vnopscommon.h */
+ static int HgfsQueryAttrInt(const char *path, HgfsHandle handle, HgfsSuperInfo *sip,
+ HgfsKReqHandle req);
+ static int HgfsRefreshHandle(struct vnode *vp, HgfsSuperInfo *sip, HgfsHandle *handle);