Changeset 81982 in vbox for trunk/src/VBox/ValidationKit/testdriver/vbox.py

Timestamp:

Nov 19, 2019 10:34:47 AM (5 years ago)

Author:

vboxsync

Message:

ValidationKit: add support for split out graphics adapter interface

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (2 diffs)

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

@@ -2029 +2029 @@
         reporter.log("  CPUs:               %s" % (oVM.CPUCount,));
         reporter.log("  RAM:                %sMB" % (oVM.memorySize,));
-        reporter.log("  VRAM:               %sMB" % (oVM.VRAMSize,));
-        reporter.log("  Monitors:           %s" % (oVM.monitorCount,));
-        reporter.log("  GraphicsController: %s"
-                     % (self.oVBoxMgr.getEnumValueName('GraphicsControllerType', oVM.graphicsControllerType),));
+        if self.fpApiVer >= 6.1 and hasattr(oVM, 'graphicsAdapter'):
+            reporter.log("  VRAM:               %sMB" % (oVM.graphicsAdapter.VRAMSize,));
+            reporter.log("  Monitors:           %s" % (oVM.graphicsAdapter.monitorCount,));
+            reporter.log("  GraphicsController: %s"
+                         % (self.oVBoxMgr.getEnumValueName('GraphicsControllerType', oVM.graphicsAdapter.graphicsControllerType),));
+        else:
+            reporter.log("  VRAM:               %sMB" % (oVM.VRAMSize,));
+            reporter.log("  Monitors:           %s" % (oVM.monitorCount,));
+            reporter.log("  GraphicsController: %s"
+                         % (self.oVBoxMgr.getEnumValueName('GraphicsControllerType', oVM.graphicsControllerType),));
         reporter.log("  Chipset:            %s" % (self.oVBoxMgr.getEnumValueName('ChipsetType', oVM.chipsetType),));
         reporter.log("  Firmware:           %s" % (self.oVBoxMgr.getEnumValueName('FirmwareType', oVM.firmwareType),));
@@ -2059 +2065 @@
             else:
                 reporter.log("  HPET:               %s" % (oVM.hpetEnabled,));
-        reporter.log("  3D acceleration:    %s" % (oVM.accelerate3DEnabled,));
-        reporter.log("  2D acceleration:    %s" % (oVM.accelerate2DVideoEnabled,));
+        if self.fpApiVer >= 6.1 and hasattr(oVM, 'graphicsAdapter'):
+            reporter.log("  3D acceleration:    %s" % (oVM.graphicsAdapter.accelerate3DEnabled,));
+            reporter.log("  2D acceleration:    %s" % (oVM.graphicsAdapter.accelerate2DVideoEnabled,));
+        else:
+            reporter.log("  3D acceleration:    %s" % (oVM.accelerate3DEnabled,));
+            reporter.log("  2D acceleration:    %s" % (oVM.accelerate2DVideoEnabled,));
         reporter.log("  TeleporterEnabled:  %s" % (oVM.teleporterEnabled,));
         reporter.log("  TeleporterPort:     %s" % (oVM.teleporterPort,));