From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:05:52 +0000 (-0700)
Subject: Changes in shared code that don't affect open-vm-tools functionality.
X-Git-Tag: 2010.07.25-280253~107
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e739259665ba131f685afa263b43d7772746bb96;p=thirdparty%2Fopen-vm-tools.git

Changes in shared code that don't affect open-vm-tools functionality.

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

diff --git a/open-vm-tools/lib/include/hostinfo.h b/open-vm-tools/lib/include/hostinfo.h
index 990bc5ba8..c4b8a1877 100644
--- a/open-vm-tools/lib/include/hostinfo.h
+++ b/open-vm-tools/lib/include/hostinfo.h
@@ -47,11 +47,6 @@ extern Bool Hostinfo_GetMemoryInfoInPages(unsigned int *minSize,
 extern Bool Hostinfo_GetSwapInfoInPages(unsigned int *totalSwap,
                                         unsigned int *freeSwap);
 #endif
-#ifdef VMX86_SERVER
-extern Bool Hostinfo_GetCOSMemoryInfoInPages(unsigned int *minSize,
-                                             unsigned int *maxSize,
-                                             unsigned int *currentSize);
-#endif
 extern Bool Hostinfo_GetRatedCpuMhz(int32 cpuNumber,
                                     uint32 *mHz);
 extern char *Hostinfo_GetCpuDescription(uint32 cpuNumber);
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 318132761..5335dc934 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -3113,7 +3113,7 @@ HostinfoSysinfo(uint64 *totalRam,  // OUT: Total RAM in bytes
  * HostinfoGetLinuxMemoryInfoInPages --
  *
  *      Obtain the minimum memory to be maintained, total memory available,
- *      and free memory available on the host (Linux or COS) in pages.
+ *      and free memory available on the host (Linux) in pages.
  *
  * Results:
  *      TRUE on success: '*minSize', '*maxSize' and '*currentSize' are set
@@ -3183,7 +3183,7 @@ HostinfoGetLinuxMemoryInfoInPages(unsigned int *minSize,      // OUT:
  *
  * HostinfoGetSwapInfoInPages --
  *
- *      Obtain the total swap and free swap on the host (Linux or COS) in
+ *      Obtain the total swap and free swap on the host (Linux) in
  *      pages.
  *
  * Results:
@@ -3311,39 +3311,6 @@ Hostinfo_GetMemoryInfoInPages(unsigned int *minSize,      // OUT:
 }
 
 
-#ifdef VMX86_SERVER
-/*
- *-----------------------------------------------------------------------------
- *
- * Hostinfo_GetCOSMemoryInfoInPages --
- *
- *      Obtain the minimum memory to be maintained, total memory available, and
- *      free memory available on the COS in pages.
- *
- * Results:
- *      TRUE on success: '*minSize', '*maxSize' and '*currentSize' are set
- *      FALSE on failure
- *
- * Side effects:
- *      None
- *
- *-----------------------------------------------------------------------------
- */
-
-Bool
-Hostinfo_GetCOSMemoryInfoInPages(unsigned int *minSize,      // OUT:
-                                 unsigned int *maxSize,      // OUT:
-                                 unsigned int *currentSize)  // OUT:
-{
-   if (HostType_OSIsPureVMK()) {
-      return FALSE;
-   } else {
-      return HostinfoGetLinuxMemoryInfoInPages(minSize, maxSize, currentSize);
-   }
-}
-#endif
-
-
 /*
  *-----------------------------------------------------------------------------
  *