From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 6 May 2022 21:28:00 +0000 (-0700)
Subject: Fix a compilation issue in the containerInfo plugin for i386 builds.
X-Git-Tag: stable-12.1.0~70
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=605c30a33f6dedc07ded8e24ce1491fba162ce82;p=thirdparty%2Fopen-vm-tools.git

Fix a compilation issue in the containerInfo plugin for i386 builds.

The "gint64" type used for time values in the code is not a "long" on
i386.  The fix using the glib "G_GINT64_FORMAT" macro was provided by
the Debian OVT maintainer.

github PR:
https://github.com/vmware/open-vm-tools/pull/588
---

diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
index 402512d09..3adc18b00 100644
--- a/open-vm-tools/AUTHORS
+++ b/open-vm-tools/AUTHORS
@@ -82,3 +82,6 @@ Marco Trevisan  Update open-vm-tools to build with either Fuse 3 or Fuse 2
 
 Bartosz Brachaczek Make HgfsConvertFromNtTimeNsec aware of 64-bit time_t on i386
                 - https://github.com/vmware/open-vm-tools/pull/387
+
+Bernd Zeimetz   Fix building containerinfo plugin on i386
+                - https://github.com/vmware/open-vm-tools/pull/588
diff --git a/open-vm-tools/services/plugins/containerInfo/containerInfo.c b/open-vm-tools/services/plugins/containerInfo/containerInfo.c
index 9c63c7b76..01fb26bae 100644
--- a/open-vm-tools/services/plugins/containerInfo/containerInfo.c
+++ b/open-vm-tools/services/plugins/containerInfo/containerInfo.c
@@ -608,7 +608,7 @@ ContainerInfoGatherTask(ToolsAppCtx *ctx,   // IN
 
    endInfoGatherTime = g_get_monotonic_time();
 
-   g_info("%s: time to complete containerInfo gather = %ld us\n",
+   g_info("%s: time to complete containerInfo gather = %" G_GINT64_FORMAT " us\n",
           __FUNCTION__, endInfoGatherTime - startInfoGatherTime);
 
 exit: