Changeset 98807 in vbox for trunk/src

Timestamp:

Mar 1, 2023 4:38:03 PM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

156126

Message:

Some small Solaris-specific build warning fixes:

Main/Console: Remove a duplicate 'HRESULT hrc' declaration (flagged as
'warning: declaration of ‘hrc’ shadows a previous local [-Wshadow]').

Main/PerformanceSolaris: Move global variable ‘g_fNotReported’ behind
'if ARCH_BITS == 32' as it's only used in 32-bit mode (flagged as
'warning: ‘g_fNotReported’ defined but not used [-Wunused-variable]').

HostDrivers/VBoxNetFlt: The vboxNetFltSolarisMuxIdToFd() routine calls
the Solaris STREAMS kernel routine strioctl() which only sets the
seventh argument (int *rvalp) upon success. vboxNetFltSolarisMuxIdToFd()
passes in an 'int *pFd' argument for this returned value and logically
only sets it upon success. The subsequent code ignores 'pFd' upon
failure but the compiler isn't smart enough to figure that out so add in
an initialization for '*pFd' (flagged as 'warning: ‘Ip6MuxFd’ may be used
uninitialized [-Wmaybe-uninitialized]' and similarly for 'Ip4MuxFd' and
'ArpMuxFd').

Location:

trunk/src/VBox

Files:

• HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c (modified) (1 diff)
• Main/src-client/ConsoleImpl.cpp (modified) (1 diff)
• Main/src-server/solaris/PerformanceSolaris.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c

@@ -1838 +1838 @@
 {
     int ret;
+
+    *pFd = -1; /* silence compiler warnings from -Wmaybe-uninitialized */
     int rc = strioctl(pVNode, _I_MUXID2FD, (intptr_t)MuxId, 0, K_TO_K, kcred, &ret);
     if (!rc)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -8500 +8500 @@
         /* setup host core dumper for the VM */
         Bstr value;
-        HRESULT hrc = mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpEnabled").raw(), value.asOutParam());
+        hrc = mMachine->GetExtraData(Bstr("VBoxInternal2/CoreDumpEnabled").raw(), value.asOutParam());
         if (SUCCEEDED(hrc) && value == "1")
         {

trunk/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp

@@ -389 +389 @@
 int CollectorSolaris::getRawHostNetworkLoad(const char *name, uint64_t *rx, uint64_t *tx)
 {
+#if ARCH_BITS == 32
     static bool g_fNotReported = true;
+#endif
     AssertReturn(strlen(name) < KSTAT_STRLEN, VERR_INVALID_PARAMETER);
     LogFlowThisFunc(("m=%s i=%d n=%s\n", "link", -1, name));