Changeset 76938 in vbox for trunk/src/VBox/ValidationKit/tests/additions/tdAddLinux1.py

Timestamp:

Jan 22, 2019 4:50:18 PM (6 years ago)

Author:

vboxsync

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

128315

Message:

Additions/linux/vboxvideo: Fix incorrect type in assignment sparse warning
bugref:8282: Additions/linux: track kernel changes to vboxvideo in our own tree

Sparse emitted the following warning:
../drivers/staging/vboxvideo/vbox_fb.c:173:27: warning: incorrect type in as

signment (different address spaces)

../drivers/staging/vboxvideo/vbox_fb.c:173:27: expected char [noderef] <a

sn:2>*screen_base

../drivers/staging/vboxvideo/vbox_fb.c:173:27: got void *virtual

The vbox_bo buffer object kernel mapping is handled by a call
to ttm_bo_kmap() prior to the assignment of bo->kmap.virtual to
info->screen_base of type char iomem*.
Casting bo->kmap.virtual to char iomem* in this assignment fixes
the warning.

vboxvideo: Fix address space of expression removal sparse warning

Sparse emitted the following warning:
../drivers/staging/vboxvideo/vbox_main.c:64:25: warning: cast removes address space of expression

vbox->vbva_buffers iomapping is handled by calling vbox_accel_init()
from vbox_hw_init().
force attribute is used in assignment to vbva to fix the warning.

Signed-off-by: Alexander Kapshuk <alexander.kapshuk@…>
Reviewed-by: Hans de Goede <hdegoede@…>
Signed-off-by: Greg Kroah-Hartman <gregkh@…>

File:

• trunk/src/VBox/ValidationKit/tests/additions/tdAddLinux1.py (copied) (copied from trunk/src/VBox/ValidationKit/tests/installation/tdGuestOsInstOs2.py ) (8 diffs)

trunk/src/VBox/ValidationKit/tests/additions/tdAddLinux1.py

@@ -4 +4 @@
 
 """
-VirtualBox Validation Kit - OS/2 install tests.
+VirtualBox Validation Kit - Linux Additions install tests.
 """
 
@@ -49 +49 @@
 
 
-class tdGuestOsInstOs2(vbox.TestDriver):
+class tdGuestOsInstLinux(vbox.TestDriver):
     """
-    OS/2 unattended installation.
+    Linux unattended installation with Additions.
 
     Scenario:
         - Create new VM that corresponds specified installation ISO image
         - Create HDD that corresponds to OS type that will be installed
-        - Set VM boot order: HDD, Floppy, ISO
-        - Start VM: sinse there is no OS installed on HDD, VM will booted from floppy
-        - After first reboot VM will continue installation from HDD automatically
-        - Wait for incomming TCP connection (guest should initiate such a
-          connection in case installation has been completed successfully)
+        - Wait for the installed Additions to write their message to the
+          machine log file.
     """
-
-    ksSataController = 'SATA Controller'
-    ksIdeController  = 'IDE Controller'
-
-    # VM parameters required to run ISO image.
-    # Format: (cBytesHdd, sKind)
-    kaoVmParams = {
-        'acp2-txs.iso': ( 2*1024*1024*1024, 'OS2', ksIdeController ),
-        'mcp2-txs.iso': ( 2*1024*1024*1024, 'OS2', ksIdeController ),
-    }
 
     def __init__(self):
@@ -83 +70 @@
         self.sIso                = None
         self.sFloppy             = None
-        self.sIsoPathBase        = os.path.join(self.sResourcePath, '4.2', 'isos')
+        self.sIsoPathBase        = os.path.join(self.sResourcePath, '5.3', 'isos')
         self.fEnableIOAPIC       = True
         self.cCpus               = 1
@@ -89 +76 @@
         self.fEnablePAE          = False
         self.asExtraData         = []
+        self.oUnattended         = None
 
     #
@@ -145 +133 @@
 
         assert self.sIso is not None
-        if self.sIso not in self.kaoVmParams:
-            reporter.log('Error: unknown ISO image specified: %s' % self.sIso)
-            return False
-
-        # Get VM params specific to ISO image
-        cBytesHdd, sKind, sController = self.kaoVmParams[self.sIso]
+
+        # Create unattended object
+        oUnattended = self.oVBox.createUnattendedInstaller()
+        self.sIso = os.path.join(self.sIsoPathBase, self.sIso)
+        assert os.path.isfile(self.sIso)
+        oUnattended.isoPath = self.sIso
+        oUnattended.user = "vbox"
+        oUnattended.password = "password"
+        oUnattended.installGuestAdditions = True
+        try:
+            oUnattended.detectIsoOS()
+        except:
+            pass
+        sOSTypeId  = oUnattended.detectedOSTypeId
+        sOSVersion = oUnattended.detectedOSVersion
+        oGuestOSType = self.oVBox.getGuestOSType(sOSTypeId)
+        assert oGuestOSType.familyId == "Linux"
 
         # Create VM itself
         eNic0AttachType = vboxcon.NetworkAttachmentType_NAT
-        self.sIso = os.path.join(self.sIsoPathBase, self.sIso)
-        assert os.path.isfile(self.sIso)
-
-        self.sFloppy = os.path.join(self.sIsoPathBase, os.path.splitext(self.sIso)[0] + '.img')
-
-        oVM = self.createTestVM(self.sVmName, 1, sKind = sKind, sDvdImage = self.sIso, cCpus = self.cCpus,
-                                sFloppy = self.sFloppy, eNic0AttachType = eNic0AttachType)
+
+        oVM = self.createTestVM(self.sVmName, 1, sKind = oGuestOSType.id, sDvdImage = None, cCpus = self.cCpus,
+                                eNic0AttachType = eNic0AttachType, sNic0MacAddr = None)
         assert oVM is not None
 
@@ -168 +163 @@
         sHddPath = os.path.join(self.sScratchPath, self.sHddName)
         fRc = True
-        if sController == self.ksSataController:
-            fRc = oSession.setStorageControllerType(vboxcon.StorageControllerType_IntelAhci, sController)
-
-        fRc = fRc and oSession.createAndAttachHd(sHddPath, cb = cBytesHdd,
+        if sOSTypeId == "RedHat" and sOSVersion.startswith("3."):
+            sController = 'IDE Controller'
+            fRc = fRc and oSession.setStorageControllerPortCount(sController, 1)
+        else:
+            sController = 'SATA Controller'
+        fRc = oSession.setStorageControllerType(vboxcon.StorageControllerType_PIIX4, sController)
+
+        fRc = fRc and oSession.createAndAttachHd(sHddPath, cb = 12 * 1024 * 1024 * 1024,
                                                  sController = sController, iPort = 0, fImmutable=False)
-        if sController == self.ksSataController:
-            fRc = fRc and oSession.setStorageControllerPortCount(sController, 1)
-
-        # Set proper boot order
-        fRc = fRc and oSession.setBootOrder(1, vboxcon.DeviceType_HardDisk)
-        fRc = fRc and oSession.setBootOrder(2, vboxcon.DeviceType_Floppy)
 
         # Enable HW virt
@@ -208 +201 @@
         fRc = oSession.close()
         assert fRc is True
+
+        # Set the machine on the unattended object
+        oUnattended.machine = oVM
+
+        # Additional set-up
+        oUnattended.prepare()
+        oUnattended.constructMedia()
+        oUnattended.reconfigureVM()
+        self.oUnattended = oUnattended
 
         return vbox.TestDriver.actionConfig(self)
@@ -245 +247 @@
 
 if __name__ == '__main__':
-    sys.exit(tdGuestOsInstOs2().main(sys.argv));
-
+    sys.exit(tdGuestOsInstLinux().main(sys.argv));
+