Changeset 101012 in vbox

Timestamp:

Sep 4, 2023 6:25:05 PM (15 months ago)

Author:

vboxsync

Message:

ValKit: Use VBoxSVGA adapter on Windows 11 guests (instead of default VBoxVGA adapter), part 2

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• vbox.py (modified) (2 diffs)
• vboxtestvms.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -2580 +2580 @@
                      fSecureBoot = False,
                      sUefiMokPathPrefix = None,
-                     eGraphicsControllerType = None):
+                     sGraphicsControllerType = None):
         """
         Creates a test VM with a immutable HD from the test resources.
@@ -2694 +2694 @@
             elif fRc and self.fpApiVer >= 6.2 and hasattr(vboxcon, 'IommuType_Intel') and sIommuType == 'intel':
                 fRc = oSession.setIommuType(vboxcon.IommuType_Intel);
-            if fRc and eGraphicsControllerType is not None:
-                fRc = oSession.setVideoControllerType(eGraphicsControllerType);
+            if fRc and sGraphicsControllerType is not None:
+                if sGraphicsControllerType == 'VBoxSVGA':
+                    fRc = oSession.setVideoControllerType(vboxcon.GraphicsControllerType_VBoxSVGA);
+                elif sGraphicsControllerType == 'VMSVGA':
+                    fRc = oSession.setVideoControllerType(vboxcon.GraphicsControllerType_VMSVGA);
+                elif sGraphicsControllerType == 'VBoxVGA':
+                    fRc = oSession.setVideoControllerType(vboxcon.GraphicsControllerType_VBoxVGA);
 
             if fRc: fRc = oSession.saveSettings();

trunk/src/VBox/ValidationKit/testdriver/vboxtestvms.py

@@ -1189 +1189 @@
             self.sCom1RawFile = self._generateRawPortFilename(oTestDrv, '-com1-', '.out');
         return oTestDrv.createTestVM(self.sVmName,
-         1,                 # iGroup
-         sHd                = self.sHd,
-         sKind              = self.sKind,
-         fIoApic            = self.fIoApic,
-         fNstHwVirt         = self.fNstHwVirt,
-         fPae               = self.fPae,
-         eNic0AttachType    = eNic0AttachType,
-         sDvdImage          = sDvdImage,
-         sDvdControllerType = self.sDvdControllerType,
-         sHddControllerType = self.sHddControllerType,
-         sFloppy            = self.sFloppy,
-         fVmmDevTestingPart = self.fVmmDevTestingPart,
-         fVmmDevTestingMmio = self.fVmmDevTestingMmio,
-         sFirmwareType      = self.sFirmwareType,
-         sChipsetType       = self.sChipsetType,
-         sIommuType         = self.sIommuType,
-         sCom1RawFile       = self.sCom1RawFile if self.fCom1RawFile else None,
-         fSecureBoot        = self.fSecureBoot,
-         sUefiMokPathPrefix = self.sUefiMokPathPrefix,
-         eGraphicsControllerType = vboxcon.GraphicsControllerType_VBoxSVGA if self.sGraphicsControllerType == 'VBoxSVGA' else None
-         );
+                                     1,                 # iGroup
+                                     sHd                = self.sHd,
+                                     sKind              = self.sKind,
+                                     fIoApic            = self.fIoApic,
+                                     fNstHwVirt         = self.fNstHwVirt,
+                                     fPae               = self.fPae,
+                                     eNic0AttachType    = eNic0AttachType,
+                                     sDvdImage          = sDvdImage,
+                                     sDvdControllerType = self.sDvdControllerType,
+                                     sHddControllerType = self.sHddControllerType,
+                                     sFloppy            = self.sFloppy,
+                                     fVmmDevTestingPart = self.fVmmDevTestingPart,
+                                     fVmmDevTestingMmio = self.fVmmDevTestingMmio,
+                                     sFirmwareType      = self.sFirmwareType,
+                                     sChipsetType       = self.sChipsetType,
+                                     sIommuType         = self.sIommuType,
+                                     sCom1RawFile       = self.sCom1RawFile if self.fCom1RawFile else None,
+                                     fSecureBoot        = self.fSecureBoot,
+                                     sUefiMokPathPrefix = self.sUefiMokPathPrefix,
+                                     sGraphicsControllerType = self.sGraphicsControllerType
+                                     );
 
     def getReconfiguredVm(self, oTestDrv, cCpus, sVirtMode, sParavirtMode = None):