Changeset 37794 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jul 6, 2011 10:24:07 AM (14 years ago)

Author:

vboxsync

Message:

more PCI passthrough fixes

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• PGM.cpp (modified) (1 diff)
• VM.cpp (modified) (1 diff)

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

@@ -2162 +2162 @@
             if (pVM->pgm.s.fPciPassthrough)
             {
-                AssertLogRelReturn(pVM->pgm.s.fRamPreAlloc, VERR_INVALID_PARAMETER);
-                AssertLogRelReturn(HWACCMIsEnabled(pVM), VERR_INVALID_PARAMETER);
-                AssertLogRelReturn(HWACCMIsNestedPagingActive(pVM), VERR_INVALID_PARAMETER);
+                AssertLogRelReturn(pVM->pgm.s.fRamPreAlloc, VERR_PCI_PASSTHROUGH_NO_RAM_PREALLOC);
+                AssertLogRelReturn(HWACCMIsEnabled(pVM), VERR_PCI_PASSTHROUGH_NO_HWACCM);
+                AssertLogRelReturn(HWACCMIsNestedPagingActive(pVM), VERR_PCI_PASSTHROUGH_NO_NESTED_PAGING);
 
                 /*

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

@@ -342 +342 @@
                                   "support and remote desktop) are only available from an 'extension "
                                   "pack' which must be downloaded and installed separately");
+                    break;
+
+                case VERR_PCI_PASSTHROUGH_NO_HWACCM:
+                    pszError = N_("PCI passthrough requires VT-x/AMD-V");
+                    break;
+
+                case VERR_PCI_PASSTHROUGH_NO_NESTED_PAGING:
+                    pszError = N_("PCI passthrough requires nested paging");
                     break;