summaryrefslogtreecommitdiff
path: root/lava_dispatcher/device/qemu.py
diff options
context:
space:
mode:
Diffstat (limited to 'lava_dispatcher/device/qemu.py')
-rw-r--r--lava_dispatcher/device/qemu.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/lava_dispatcher/device/qemu.py b/lava_dispatcher/device/qemu.py
index d4212ea..dbb260d 100644
--- a/lava_dispatcher/device/qemu.py
+++ b/lava_dispatcher/device/qemu.py
@@ -39,7 +39,7 @@ from lava_dispatcher.utils import (
extract_tar,
finalize_process,
extract_ramdisk,
- extract_modules,
+ extract_overlay,
create_ramdisk
)
from lava_dispatcher.errors import (
@@ -72,9 +72,8 @@ class QEMUTarget(Target):
self.context,
decompress=False))
- def deploy_linaro_kernel(self, kernel, ramdisk, dtb, modules, rootfs, nfsrootfs,
- bootloader, firmware, bl1, bl2, bl31, rootfstype,
- bootloadertype, target_type):
+ def deploy_linaro_kernel(self, kernel, ramdisk, dtb, overlays, rootfs, nfsrootfs, bootloader, firmware, bl1, bl2,
+ bl31, rootfstype, bootloadertype, target_type):
# Check for errors
if rootfs is None and ramdisk is None:
raise CriticalError("You must specify a QEMU file system image or ramdisk")
@@ -90,13 +89,14 @@ class QEMUTarget(Target):
if ramdisk is not None:
ramdisk = download_image(ramdisk, self.context,
decompress=False)
- if modules is not None:
- modules = download_image(modules, self.context,
- self.scratch_dir,
- decompress=False)
+ if overlays is not None:
ramdisk_dir = extract_ramdisk(ramdisk, self.scratch_dir,
is_uboot=self._is_uboot_ramdisk(ramdisk))
- extract_modules(modules, ramdisk_dir)
+ for overlay in overlays:
+ overlay = download_image(overlay, self.context,
+ self.scratch_dir,
+ decompress=False)
+ extract_overlay(overlay, ramdisk_dir)
ramdisk = create_ramdisk(ramdisk_dir, self.scratch_dir)
self._ramdisk = ramdisk
if rootfs is None: