From 600b2bcde77c4add84d85b396af95433343def6a Mon Sep 17 00:00:00 2001
From: Cathy Avery <cavery@redhat.com>
Date: Thu, 14 Jan 2021 13:25:51 -0500
Subject: [PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )

RH-Author: Cathy Avery <cavery@redhat.com>
Message-id: <20210114132551.5365-1-cavery@redhat.com>
Patchwork-id: 100651
O-Subject: [RHEL-7.9.z open-vm-tools PATCH] Rectify a log spew in vmsvc logging (vmware-vmsvc-root.log )
Bugzilla: 1911853
RH-Acked-by: Vitaly Kuznetsov <vkuznets@redhat.com>
RH-Acked-by: Mohammed Gamal <mgamal@redhat.com>

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1911853
Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=34221678
Branch: rhel7/master-11.0.5
Tested: By QE
Upstream Status: upstream/stable-11.0.5

When a LSI Logic Parallel SCSI controller sits in PCI bus 0
(SCSI controller 0), the Linux disk device enumeration does not provide
a "label" file with the controller name.  This results in messages like

"GuestInfoGetDiskDevice: Missing disk device name; VMDK mapping unavailable for "/var/log", fsName: "/dev/sda2"

repeatedly appearing in the vmsvc logging.  The patch converts what previously
was a warning message to a debug message and thus avoids the log spew.

(cherry picked from commit 4ee0bd3c8ead89541ab7d196fb54e940e397420d)
Signed-off-by: Cathy Avery <cavery@redhat.com>
Signed-off-by: Jon Maloy <jmaloy.redhat.com>
---
 open-vm-tools/services/plugins/guestInfo/diskInfo.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/open-vm-tools/services/plugins/guestInfo/diskInfo.c b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
index 878276ce..032c0928 100644
--- a/open-vm-tools/services/plugins/guestInfo/diskInfo.c
+++ b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
@@ -846,9 +846,9 @@ GuestInfoGetDiskDevice(const char *fsName,
     */
    for (indx = 0; indx < partEntry->diskDevCnt; indx++) {
       if (partEntry->diskDevNames[indx][0] == '\0') {
-         g_warning("%s: Missing disk device name; VMDK mapping unavailable "
-                   "for \"%s\", fsName: \"%s\"\n", __FUNCTION__,
-                   partEntry->name, fsName);
+         g_debug("%s: Missing disk device name; VMDK mapping unavailable "
+                 "for \"%s\", fsName: \"%s\"\n", __FUNCTION__,
+                 partEntry->name, fsName);
          partEntry->diskDevCnt = 0;
          free(partEntry->diskDevNames);
          partEntry->diskDevNames = NULL;
-- 
2.18.2