Changeset 61930 in vbox for trunk/src/VBox/Main

Timestamp:

Jun 29, 2016 12:37:43 PM (9 years ago)

Author:

vboxsync

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

108369

Message:

i_setVMRuntimeErrorCallback -> i_atVMRuntimeErrorCallback - ambigious name (it's not setting the callback).

Location:

trunk/src/VBox/Main

Files:

• include/ConsoleImpl.h (modified) (1 diff)
• src-client/ConsoleImpl.cpp (modified) (4 diffs)
• src-client/ConsoleImpl2.cpp (modified) (9 diffs)

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

@@ -736 +736 @@
                                                             const char *pszErrorFmt, va_list va);
 
-    void                        i_setVMRuntimeErrorCallbackF(uint32_t fFatal, const char *pszErrorId, const char *pszFormat, ...);
-    static DECLCALLBACK(void)   i_setVMRuntimeErrorCallback(PUVM pUVM, void *pvUser, uint32_t fFatal,
-                                                            const char *pszErrorId, const char *pszFormat, va_list va);
+    void                        i_atVMRuntimeErrorCallbackF(uint32_t fFatal, const char *pszErrorId, const char *pszFormat, ...);
+    static DECLCALLBACK(void)   i_atVMRuntimeErrorCallback(PUVM pUVM, void *pvUser, uint32_t fFatal,
+                                                           const char *pszErrorId, const char *pszFormat, va_list va);
 
     HRESULT                     i_captureUSBDevices(PUVM pUVM);

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

@@ -8030 +8030 @@
         rc = rc2;
         if (online)
-            i_setVMRuntimeErrorCallbackF(0, "BrokenSharedFolder",
-                                         N_("Broken shared folder!"));
+            i_atVMRuntimeErrorCallbackF(0, "BrokenSharedFolder", N_("Broken shared folder!"));
     }
 
@@ -9237 +9236 @@
 
 /**
- * VM runtime error callback function.
+ * VM runtime error callback function (FNVMATRUNTIMEERROR).
+ *
  * See VMSetRuntimeError for the detailed description of parameters.
  *
@@ -9250 +9250 @@
  */
 /* static */ DECLCALLBACK(void)
-Console::i_setVMRuntimeErrorCallback(PUVM pUVM, void *pvUser, uint32_t fFlags,
-                                     const char *pszErrorId,
-                                     const char *pszFormat, va_list va)
+Console::i_atVMRuntimeErrorCallback(PUVM pUVM, void *pvUser, uint32_t fFlags,
+                                    const char *pszErrorId, const char *pszFormat, va_list va)
 {
     bool const fFatal = !!(fFlags & VMSETRTERR_FLAGS_FATAL);
@@ -9679 +9678 @@
                         {
                             ErrorInfoKeeper eik;
-                            pConsole->i_setVMRuntimeErrorCallbackF(0, "BrokenSharedFolder",
+                            pConsole->i_atVMRuntimeErrorCallbackF(0, "BrokenSharedFolder",
                                    N_("The shared folder '%s' could not be set up: %ls.\n"
                                       "The shared folder setup will not be complete. It is recommended to power down the virtual "

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

@@ -3313 +3313 @@
      * Register VM runtime error handler.
      */
-    rc2 = VMR3AtRuntimeErrorRegister(pUVM, Console::i_setVMRuntimeErrorCallback, this);
+    rc2 = VMR3AtRuntimeErrorRegister(pUVM, Console::i_atVMRuntimeErrorCallback, this);
     AssertRC(rc2);
     if (RT_SUCCESS(rc))
@@ -3707 +3707 @@
  * Ellipsis to va_list wrapper for calling setVMRuntimeErrorCallback.
  */
-void Console::i_setVMRuntimeErrorCallbackF(uint32_t fFlags, const char *pszErrorId, const char *pszFormat, ...)
+void Console::i_atVMRuntimeErrorCallbackF(uint32_t fFlags, const char *pszErrorId, const char *pszFormat, ...)
 {
     va_list va;
     va_start(va, pszFormat);
-    i_setVMRuntimeErrorCallback(NULL, this, fFlags, pszErrorId, pszFormat, va);
+    i_atVMRuntimeErrorCallback(NULL, this, fFlags, pszErrorId, pszFormat, va);
     va_end(va);
 }
@@ -3985 +3985 @@
                     const char *pszUnit;
                     uint64_t u64Print = formatDiskSize((uint64_t)i64Size, &pszUnit);
-                    i_setVMRuntimeErrorCallbackF(0, "FatPartitionDetected",
+                    i_atVMRuntimeErrorCallbackF(0, "FatPartitionDetected",
                             N_("The medium '%ls' has a logical size of %RU64%s "
                             "but the file system the medium is located on seems "
@@ -4016 +4016 @@
                             uint64_t u64PrintSiz = formatDiskSize((LONG64)i64Size, &pszUnitSiz);
                             uint64_t u64PrintMax = formatDiskSize(maxSize, &pszUnitMax);
-                            i_setVMRuntimeErrorCallbackF(0, "FatPartitionDetected", /* <= not exact but ... */
+                            i_atVMRuntimeErrorCallbackF(0, "FatPartitionDetected", /* <= not exact but ... */
                                     N_("The medium '%ls' has a logical size of %RU64%s "
                                     "but the file system the medium is located on can "
@@ -4039 +4039 @@
                     const char *pszUnit;
                     uint64_t u64Print = formatDiskSize(i64Size, &pszUnit);
-                    i_setVMRuntimeErrorCallbackF(0, "FatPartitionDetected",
+                    i_atVMRuntimeErrorCallbackF(0, "FatPartitionDetected",
 #ifdef RT_OS_WINDOWS
                             N_("The snapshot folder of this VM '%ls' seems to be located on "
@@ -4080 +4080 @@
                         || enmFsTypeFile == RTFSTYPE_XFS)
                     {
-                        i_setVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
+                        i_atVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
                                 N_("The host I/O cache for at least one controller is disabled "
                                    "and the medium '%ls' for this VM "
@@ -4097 +4097 @@
                              && !mfSnapshotFolderExt4WarningShown)
                     {
-                        i_setVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
+                        i_atVMRuntimeErrorCallbackF(0, "Ext4PartitionDetected",
                                 N_("The host I/O cache for at least one controller is disabled "
                                    "and the snapshot folder for this VM "
@@ -4331 +4331 @@
                     Bstr loc;
                     hrc = pMedium->COMGETTER(Location)(loc.asOutParam());                   H();
-                    i_setVMRuntimeErrorCallbackF(0, "DvdOrFloppyImageInaccessible",
-                                                 "The image file '%ls' is inaccessible and is being ignored. "
-                                                 "Please select a different image file for the virtual %s drive.",
-                                                 loc.raw(),
-                                                 enmType == DeviceType_DVD ? "DVD" : "floppy");
+                    i_atVMRuntimeErrorCallbackF(0, "DvdOrFloppyImageInaccessible",
+                                                "The image file '%ls' is inaccessible and is being ignored. "
+                                                "Please select a different image file for the virtual %s drive.",
+                                                loc.raw(),
+                                                enmType == DeviceType_DVD ? "DVD" : "floppy");
                     pMedium = NULL;
                 }
@@ -5111 +5111 @@
                         if (ioctl(iSock, SIOCGIFFLAGS, &Req) >= 0)
                             if ((Req.ifr_flags & IFF_UP) == 0)
-                                i_setVMRuntimeErrorCallbackF(0, "BridgedInterfaceDown",
+                                i_atVMRuntimeErrorCallbackF(0, "BridgedInterfaceDown",
                                      N_("Bridged interface %s is down. Guest will not be able to use this interface"),
                                      pszBridgedIfName);