From 6818af98498a890bcca9cbc8034aaa1a733e6230 Mon Sep 17 00:00:00 2001 From: Vincenzo Maffione Date: Sat, 8 Apr 2017 12:36:51 +0200 Subject: testbeds: qemu: modify constructor arguments vm_img_folder --> bzimage, initramfs --- rumba/testbeds/qemu.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'rumba/testbeds') diff --git a/rumba/testbeds/qemu.py b/rumba/testbeds/qemu.py index 8079f28..82ad873 100644 --- a/rumba/testbeds/qemu.py +++ b/rumba/testbeds/qemu.py @@ -27,12 +27,13 @@ import rumba.model as mod class Testbed(mod.Testbed): - def __init__(self, exp_name, username, vm_img_folder, proj_name="ARCFIRE", password="", + def __init__(self, exp_name, username, bzimage, initramfs, proj_name="ARCFIRE", password="", use_vhost=True, qemu_out_folder=""): mod.Testbed.__init__(self, exp_name, username, password, proj_name) self.vms = {} self.shims = [] - self.vm_img_path = vm_img_folder + self.bzimage = bzimage + self.initramfs = initramfs self.vhost = use_vhost self.qemu_folder = qemu_out_folder self.boot_processes = [] @@ -173,7 +174,9 @@ class Testbed(mod.Testbed): vm['id'] = vmid vars_dict = {'fwdp': fwdp, 'id': vmid, 'mac': mac, - 'vmimgpath': self.vm_img_path, 'fwdc': fwdc, + 'bzimage': self.bzimage, + 'initramfs': self.initramfs, + 'fwdc': fwdc, 'memory': vm_memory, 'frontend': vm_frontend, 'vmname': name} @@ -182,9 +185,9 @@ class Testbed(mod.Testbed): command = 'qemu-system-x86_64 ' # TODO manage non default images - command += ('-kernel %(vmimgpath)s/bzImage ' + command += ('-kernel %(bzimage)s ' '-append "console=ttyS0" ' - '-initrd %(vmimgpath)s/rootfs.cpio ' + '-initrd %(initramfs)s ' % vars_dict) command += ('-nographic ' '-display none ' -- cgit v1.2.3