Remove vmciGuestKernelIf.c on Linux, Windows, Solaris

This change moves the functionality of vmciGuestKernelIf.c to
vmciKernelIf.c on all guest platforms except MacOS. On MacOS,
the functionality in vmciGuestKernelIf.cpp is more tightly
coupled with the methods exported by the driver object, so
that is left alone for now. Added compat_pci.h and
compat_ioport.h to host driver tarball.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/modules/linux/vmci/vmciGuestKernelIf.c b/open-vm-tools/modules/linux/vmci/vmciGuestKernelIf.c
deleted file mode 100644 (file)
index 6b3da46..0000000
--- a/open-vm-tools/modules/linux/vmci/vmciGuestKernelIf.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/*********************************************************
- * Copyright (C) 2007 VMware, Inc. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- *********************************************************/
-
-/*
- * vmciGuestKernelIf.c --
- *
- *      This file implements guest only OS helper functions for VMCI.
- *      This is the linux specific implementation.
- */
-
-/* Must come before any kernel header file */
-#include "driver-config.h"
-
-#if !defined(linux) || defined(VMKERNEL)
-#error "Wrong platform."
-#endif
-
-#include <linux/moduleparam.h>
-
-#include "compat_version.h"
-#include "compat_pci.h"
-#include "vm_basic_types.h"
-#include "vmciDriver.h"
-
-
-/*
- *-----------------------------------------------------------------------------
- *
- * VMCI_ReadPortBytes --
- *
- *      Copy memory from an I/O port to kernel memory.
- *
- * Results:
- *      No results.
- *
- * Side effects:
- *      None.
- *
- *-----------------------------------------------------------------------------
- */
-
-void
-VMCI_ReadPortBytes(VMCIIoHandle handle,  // IN: Unused
-                  VMCIIoPort port,      // IN
-                  uint8 *buffer,        // OUT
-                  size_t bufferLength)  // IN
-{
-   insb(port, buffer, bufferLength);
-}

diff --git a/open-vm-tools/modules/linux/vmci/vmciKernelIf.c b/open-vm-tools/modules/linux/vmci/vmciKernelIf.c
index 0c06e75f35383b51a3ccbbb5c6dd58e7b64ca4d7..21516980bb144df0a8a211d66ea9f8a49bd7bed2 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/vmciKernelIf.c
+++ b/open-vm-tools/modules/linux/vmci/vmciKernelIf.c
@@ -38,20 +38,22 @@
 #include <linux/mm.h>           /* For vmalloc_to_page() and get_user_pages()*/
 #include <linux/pagemap.h>      /* For page_cache_release() */
 #include <linux/socket.h>       /* For memcpy_{to,from}iovec(). */
-#include <linux/wait.h>
 #include <linux/vmalloc.h>
+#include <linux/wait.h>
 
+#include "compat_highmem.h"
+#include "compat_interrupt.h"
+#include "compat_mm.h"
 #include "compat_module.h"
-#include "compat_version.h"
+#include "compat_page.h"
+#include "compat_pci.h"
 #include "compat_sched.h"
-#include "compat_workqueue.h"
-#include "compat_interrupt.h"
-#include "compat_spinlock.h"
-#include "compat_slab.h"
 #include "compat_semaphore.h"
-#include "compat_page.h"
-#include "compat_mm.h"
-#include "compat_highmem.h"
+#include "compat_slab.h"
+#include "compat_spinlock.h"
+#include "compat_version.h"
+#include "compat_workqueue.h"
+
 #include "vm_assert.h"
 #include "vm_basic_types.h"
 #include "vmci_iocontrols.h"
@@ -1624,3 +1626,29 @@ VMCIHost_ReleaseUserMemory(PageStoreAttachInfo *attach,      // IN/OUT
                       attach->numConsumePages *
                       sizeof attach->consumePages[0]);
 }
+
+
+/*
+ *-----------------------------------------------------------------------------
+ *
+ * VMCI_ReadPortBytes --
+ *
+ *      Copy memory from an I/O port to kernel memory.
+ *
+ * Results:
+ *      No results.
+ *
+ * Side effects:
+ *      None.
+ *
+ *-----------------------------------------------------------------------------
+ */
+
+void
+VMCI_ReadPortBytes(VMCIIoHandle handle,  // IN: Unused
+                  VMCIIoPort port,      // IN
+                  uint8 *buffer,        // OUT
+                  size_t bufferLength)  // IN
+{
+   insb(port, buffer, bufferLength);
+}

diff --git a/open-vm-tools/modules/linux/vmci/vmci_version.h b/open-vm-tools/modules/linux/vmci/vmci_version.h
index 68fac7e46fbe98eabfc9f3873209f2a96f5c5d60..7a6476182be53a0073af80aa734514bdd959dec4 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/vmci_version.h
+++ b/open-vm-tools/modules/linux/vmci/vmci_version.h
@@ -25,8 +25,8 @@
 #ifndef _VMCI_VERSION_H_
 #define _VMCI_VERSION_H_
 
-#define VMCI_DRIVER_VERSION          9.1.10.0
-#define VMCI_DRIVER_VERSION_COMMAS   9,1,10,0
-#define VMCI_DRIVER_VERSION_STRING   "9.1.10.0"
+#define VMCI_DRIVER_VERSION          9.1.11.0
+#define VMCI_DRIVER_VERSION_COMMAS   9,1,11,0
+#define VMCI_DRIVER_VERSION_STRING   "9.1.11.0"
 
 #endif /* _VMCI_VERSION_H_ */