From: Katy Feng <fkaty@vmware.com>
Date: Thu, 5 Oct 2023 17:35:26 +0000 (-0700)
Subject: Changes to common source files not applicable to open-vm-tools.
X-Git-Tag: stable-12.4.0~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1930fbc010efcfb95196a999e6f24c9bcb19087f;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 68c2d138a..e18715d7a 100644
--- a/open-vm-tools/services/vmtoolsd/cmdLine.c
+++ b/open-vm-tools/services/vmtoolsd/cmdLine.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2008-2021 VMware, Inc. All rights reserved.
+ * Copyright (c) 2008-2021,2023 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -44,6 +44,10 @@
 #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.
@@ -136,6 +140,7 @@ ToolsCoreRunCommandFromFile(const gchar *option,
                   "Unable to send command from file to VMware hypervisor."));
    exit(1);
 }
+#endif //_ARM64_
 
 
 #if defined(G_PLATFORM_WIN32)
@@ -286,12 +291,17 @@ 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 d6487aedb..f6f595562 100644
--- a/open-vm-tools/services/vmtoolsd/mainLoop.c
+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (c) 2008-2022 VMware, Inc. All rights reserved.
+ * Copyright (c) 2008-2023 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -1201,7 +1201,12 @@ ToolsCore_Setup(ToolsServiceState *state)
 #else
    state->ctx.mainLoop = g_main_loop_new(gctx, FALSE);
 #endif
+   /*
+    * TODO: Build vmcheck library
+    */
+#ifndef _ARM64_
    state->ctx.isVMware = VmCheck_IsVirtualWorld();
+#endif
    g_main_context_unref(gctx);
 
    g_type_init();