vbox的更動 54970 路徑 trunk/src/VBox/VMM/VMMR3

時間撮記:

2015-3-26 下午03:57:35 (10 年 以前)

作者:

vboxsync

訊息:

AsyncCompletion: Better error message if I/O manager could not be created due to insufficient host limits

位置:

trunk/src/VBox/VMM/VMMR3

檔案:

• PDMAsyncCompletionFile.cpp (修改) (5 筆差異)
• PDMAsyncCompletionFileNormal.cpp (修改) (2 筆差異)

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -590 +590 @@
 }
 
-/**
- * Get the size of the given file.
- * Works for block devices too.
- *
- * @returns VBox status code.
- * @param   hFile    The file handle.
- * @param   pcbSize  Where to store the size of the file on success.
- */
-static int pdmacFileEpNativeGetSize(RTFILE hFile, uint64_t *pcbSize)
-{
-    uint64_t cbFile;
-    int rc = RTFileGetSize(hFile, &cbFile);
-    if (RT_SUCCESS(rc))
-        *pcbSize = cbFile;
-
-    return rc;
-}
-
 #ifdef VBOX_WITH_DEBUGGER
 
@@ -964 +946 @@
             uint64_t cbSize;
 
-            rc = pdmacFileEpNativeGetSize(hFile, &cbSize);
+            rc = RTFileGetSize(hFile, &cbSize);
 
             if (RT_SUCCESS(rc) && ((cbSize % 512) == 0))
@@ -1022 +1004 @@
         pEpFile->fFlags = fFileFlags;
 
-        rc = pdmacFileEpNativeGetSize(pEpFile->hFile, (uint64_t *)&pEpFile->cbFile);
+        rc = RTFileGetSize(pEpFile->hFile, (uint64_t *)&pEpFile->cbFile);
         if (RT_SUCCESS(rc))
         {
@@ -1084 +1066 @@
                         }
                     }
+                }
+                else if (rc == VERR_FILE_AIO_INSUFFICIENT_EVENTS)
+                {
+                    PUVM pUVM = VMR3GetUVM(pEpClassFile->Core.pVM);
+#if defined(RT_OS_LINUX)
+                    rc = VMR3SetError(pUVM, rc, RT_SRC_POS,
+                                      N_("Failed to create I/O manager for VM due to insufficient resources on the host. "
+                                         "Either increase the amount of allowed events in /proc/sys/fs/aio-max-nr or enable "
+                                         "the host I/O cache"));
+#else
+                    rc = VMR3SetError(pUVM, rc, RT_SRC_POS,
+                                      N_("Failed to create I/O manager for VM due to insufficient resources on the host. "
+                                         "Enable the host I/O cache"));
+#endif
+                }
+                else
+                {
+                    PUVM pUVM = VMR3GetUVM(pEpClassFile->Core.pVM);
+                    rc = VMR3SetError(pUVM, rc, RT_SRC_POS,
+                                      N_("Failed to create I/O manager for VM due to an unknown error"));
                 }
             }

trunk/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 #define PDMACEPFILEMGR_LOAD_UPDATE_PERIOD   1000
 /** Maximum number of requests a manager will handle. */
-#define PDMACEPFILEMGR_REQS_STEP            512
+#define PDMACEPFILEMGR_REQS_STEP              64