From: Katy Feng <fkaty@vmware.com>
Date: Fri, 25 Aug 2023 18:58:47 +0000 (-0700)
Subject: Changes to common source files not applicable to open-vm-tools.
X-Git-Tag: stable-12.3.0~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96cd002a39a3ec1fd97f1773fb6e8a6ac7dad919;p=thirdparty%2Fopen-vm-tools.git

Changes to common source files not applicable to open-vm-tools.
---

diff --git a/open-vm-tools/services/vmtoolsd/cmdLine.c b/open-vm-tools/services/vmtoolsd/cmdLine.c
index e18715d7a..c98ac1967 100644
--- a/open-vm-tools/services/vmtoolsd/cmdLine.c
+++ b/open-vm-tools/services/vmtoolsd/cmdLine.c
@@ -44,10 +44,6 @@
 #include "vmware/tools/guestrpc.h"
 #include "vm_version.h"
 
-/*
- * TODO: Build vmcheck library
- */
-#ifndef _ARM64_
 /**
  * Runs the given Tools RPC command, printing the result to the terminal and
  * exiting the application afterwards.
@@ -140,7 +136,6 @@ ToolsCoreRunCommandFromFile(const gchar *option,
                   "Unable to send command from file to VMware hypervisor."));
    exit(1);
 }
-#endif //_ARM64_
 
 
 #if defined(G_PLATFORM_WIN32)
@@ -291,17 +286,12 @@ ToolsCore_ParseCommandLine(ToolsServiceState *state,
       { "plugin-path", 'p', 0, G_OPTION_ARG_FILENAME, &state->pluginPath,
          SU_(cmdline.pluginpath, "Path to the plugin directory."),
          SU_(cmdline.path, "path") },
-/*
- * TODO: Build vmcheck library
- */
-#ifndef _ARM64_
       { "cmd", '\0', 0, G_OPTION_ARG_CALLBACK, ToolsCoreRunCommand,
          SU_(cmdline.rpc, "Sends an RPC command to the host and exits."),
          SU_(cmdline.rpc.command, "command") },
       { "cmdfile", '\0', 0, G_OPTION_ARG_CALLBACK, ToolsCoreRunCommandFromFile,
          SU_(cmdline.cmdfile, "Sends an RPC command from a file to the host and exits."),
          SU_(cmdline.cmdfile.command, "command file") },
-#endif //_ARM64+
 #if defined(G_PLATFORM_WIN32)
       { "dump-state", 's', 0, G_OPTION_ARG_NONE, &dumpState,
          SU_(cmdline.state, "Dumps the internal state of a running service instance to the logs."),
diff --git a/open-vm-tools/services/vmtoolsd/mainLoop.c b/open-vm-tools/services/vmtoolsd/mainLoop.c
index 40767f3a5..5217be5da 100644
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -1204,9 +1204,7 @@ ToolsCore_Setup(ToolsServiceState *state)
    /*
     * TODO: Build vmcheck library
     */
-#ifndef _ARM64_
    state->ctx.isVMware = VmCheck_IsVirtualWorld();
-#endif
    g_main_context_unref(gctx);
 
    g_type_init();