Changeset 35171 in vbox for trunk/src

Timestamp:

Dec 16, 2010 10:53:50 AM (14 years ago)

Author:

vboxsync

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

69010

Message:

Main/Console: log the file system of the snapshot folder as well

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (1 diff)
• ConsoleImpl2.cpp (modified) (4 diffs)
• include/ConsoleImpl.h (modified) (1 diff)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -336 +336 @@
     , mfSnapshotFolderSizeWarningShown(false)
     , mfSnapshotFolderExt4WarningShown(false)
+    , mfSnapshotFolderDiskTypeShown(false)
     , mpVmm2UserMethods(NULL)
     , m_pVMMDev(NULL)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2065 +2065 @@
                      */
                     static const char *s_pszUsbExtPackName = "Oracle VM VirtualBox Extension Pack";
+# ifdef VBOX_WITH_EXTPACK
                     if (pConsole->mptrExtPackManager->isExtPackUsable(s_pszUsbExtPackName))
+# endif
                     {
                         InsertConfigNode(pDevices, "usb-ehci", &pDev);
@@ -2087 +2089 @@
                         InsertConfigInteger(pCfg,  "Last",     0);
                     }
+# ifdef VBOX_WITH_EXTPACK
                     else
                     {
@@ -2106 +2109 @@
                                 s_pszUsbExtPackName);
                     }
+# endif
                 }
 #endif
@@ -2772 +2776 @@
                  * still don't have a snapshot folder. */
                 (void)RTFsQueryType(utfSnap.c_str(), &enmFsTypeSnap);
+                if (!mfSnapshotFolderDiskTypeShown)
+                {
+                    LogRel(("File system of '%s' (snapshots) is %s\n", utfSnap.c_str(), RTFsTypeName(enmFsTypeSnap)));
+                    mfSnapshotFolderDiskTypeShown = true;
+                }
                 LogRel(("File system of '%s' is %s\n", utfFile.c_str(), RTFsTypeName(enmFsTypeFile)));
                 LONG64 i64Size;

trunk/src/VBox/Main/include/ConsoleImpl.h

@@ -653 +653 @@
     /** true if we already showed the snapshot folder ext4/xfs bug warning. */
     bool mfSnapshotFolderExt4WarningShown : 1;
+    /** true if we already listed the disk type of the snapshot folder. */
+    bool mfSnapshotFolderDiskTypeShown : 1;
 
     /** Pointer to the VMM -> User (that's us) callbacks.