Changeset 72315 in vbox for trunk/src/VBox/ValidationKit/testdriver

Timestamp:

May 24, 2018 9:22:38 AM (7 years ago)

Author:

vboxsync

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

122768

Message:

ValidationKit: Add support for basic nested hardware-virtualization smoke tests.

Location:

trunk/src/VBox/ValidationKit/testdriver

Files:

• vbox.py (modified) (3 diffs)
• vboxtestvms.py (modified) (5 diffs)
• vboxwrappers.py (modified) (1 diff)

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

@@ -1976 +1976 @@
             reporter.log("  PAE:                %s" % (oVM.getCpuProperty(vboxcon.CpuPropertyType_PAE)));
             reporter.log("  Synthetic CPU:      %s" % (oVM.getCpuProperty(vboxcon.CpuPropertyType_Synthetic)));
+        if self.fpApiVer >= 5.3 and hasattr(vboxcon, 'CPUPropertyType_HWVirt'):
+            reporter.log("  Nested VT-x/AMD-V:  %s" % (oVM.getCPUProperty(vboxcon.CPUPropertyType_HWVirt)));
         reporter.log("  ACPI:               %s" % (oVM.BIOSSettings.ACPIEnabled));
         reporter.log("  IO-APIC:            %s" % (oVM.BIOSSettings.IOAPICEnabled));
@@ -2208 +2210 @@
                      sKind = "Other",
                      fIoApic = None,
+                     fNstHwVirt = None,
                      fPae = None,
                      fFastBootLogo = True,
@@ -2280 +2283 @@
             if fRc and fIoApic is not None:
                 fRc = oSession.enableIoApic(fIoApic);
+            if fRc and fNstHwVirt is not None:
+                fRc = oSession.enableNestedHwVirt(fNstHwVirt);
             if fRc and fPae is not None:
                 fRc = oSession.enablePae(fPae);

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

@@ -207 +207 @@
                  asVirtModesSup = None,                     # type: List[str]
                  fIoApic = None,                            # type: bool
+                 fNstHwVirt = False,                        # type: bool
                  fPae = None,                               # type: bool
                  sNic0AttachType = None,                    # type: str
@@ -233 +234 @@
         self.sDvdControllerType      = sDvdControllerType;
         self.fIoApic                 = fIoApic;
+        self.fNstHwVirt              = fNstHwVirt;
         self.fPae                    = fPae;
         self.sNic0AttachType         = sNic0AttachType;
@@ -408 +410 @@
                                      sKind              = self.sKind,
                                      fIoApic            = self.fIoApic,
+                                     fNstHwVirt         = self.fNstHwVirt,
                                      fPae               = self.fPae,
                                      eNic0AttachType    = eNic0AttachType,
@@ -914 +917 @@
         fRc = True;
         for oTestVm in self.aoTestVms:
+            if oTestVm.fNstHwVirt and not oTestDrv.isHostCpuAmd():
+                reporter.log2('Ignoring VM %s (Nested hardware-virtualization only supported on AMD CPUs).' % (oTestVm.sVmName,));
+                continue;
             if oTestVm.fSkip and self.fIgnoreSkippedVm:
                 reporter.log2('Ignoring VM %s (fSkip = True).' % (oTestVm.sVmName,));
@@ -1113 +1119 @@
         #       sKind = 'Windows10_64', acCpusSup = range(1, 33), fIoApic = True, sFirmwareType = 'efi', sChipsetType = 'ich9'),
 
+        # Nested hardware-virtualization
+        #TestVm('tst-nsthwvirt-ubuntu-64',    kfGrpStdSmoke,       sHd = '4.2/nat/nsthwvirt-ubuntu64/t-nsthwvirt-ubuntu64.vdi',
+        #       sKind = 'Ubuntu_64', acCpusSup = range(1, 2), asVirtModesSup = ['hwvirt-np',], fIoApic = True, fNstHwVirt = True,
+        #       sNic0AttachType = 'nat'),
+
         # DOS and Old Windows.
         AncientTestVm('tst-dos20',              sKind = 'DOS',

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

@@ -992 +992 @@
         else:
             reporter.log('set CPUPropertyType_LongMode=%s for "%s"' % (fEnable, self.sName));
+        self.oTstDrv.processPendingEvents();
+        return fRc;
+
+    def enableNestedHwVirt(self, fEnable):
+        """
+        Enables or disables Nested Hardware-Virtualization.
+        Returns True on success and False on failure.  Error information is logged.
+        """
+        # Supported.
+        if self.fpApiVer < 5.3  or  not hasattr(vboxcon, 'CPUPropertyType_HWVirt'):
+            return True;
+
+        # Enable/disable it.
+        fRc = True;
+        try:
+            self.o.machine.setCPUProperty(vboxcon.CPUPropertyType_HWVirt, fEnable);
+        except:
+            reporter.errorXcpt('failed to set CPUPropertyType_HWVirt=%s for "%s"' % (fEnable, self.sName));
+            fRc = False;
+        else:
+            reporter.log('set CPUPropertyType_HWVirt=%s for "%s"' % (fEnable, self.sName));
         self.oTstDrv.processPendingEvents();
         return fRc;