diff options
| author | dann frazier <dann.frazier@canonical.com> | 2014-04-25 16:32:53 -0600 |
|---|---|---|
| committer | dann frazier <dann.frazier@canonical.com> | 2014-04-25 16:32:53 -0600 |
| commit | c726d1e237f33b37b20f7ad8654924a5d5ad6490 (patch) | |
| tree | 1fff86b915a0a42a6a4c9887afe85901f6d75276 | |
| parent | d465b52c6150c81ea906813c2e1de1f0c4f88447 (diff) | |
Fix qemu invocation on ARM
The current invocation of QEMU fails on armhf with the message: qemu: invalid ram size: 3.13.0-24-generic-lpae This is because the command generation has swapped the parameters for memory size and uname. Correct this.
| -rwxr-xr-x | bin/virtualization | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/virtualization b/bin/virtualization index 330f954..0b294f2 100755 --- a/bin/virtualization +++ b/bin/virtualization @@ -122,7 +122,7 @@ class KVMTest(object): if re.match("(arm.*|aarch64)", self.arch): uname = check_output(['uname', '-r'], universal_newlines=True) cloud_disk = cloud_disk.replace("virtio", "sd") - params = 'qemu-system-arm -machine vexpress-a15 -cpu cortex-a15 -enable-kvm -m {} -kernel /boot/vmlinuz -append "console=ttyAMA0 earlyprintk=serial root=/dev/mmcblk0 ro rootfstype=ext4" -serial stdio -dtb /lib/firmware/{}/device-tree/vexpress-v2p-ca15-tc1.dtb -initrd /boot/initrd.img -net nic -net user,net={},host={},hostfwd={} -drive file={},if=sd,cache=writeback {} -display none -nographic'.format(uname, "256", netrange, image_ip, hostfwd, data_disk, cloud_disk) + params = ['qemu-system-arm -machine vexpress-a15 -cpu cortex-a15 -enable-kvm -m {} -kernel /boot/vmlinuz -append "console=ttyAMA0 earlyprintk=serial root=/dev/mmcblk0 ro rootfstype=ext4" -serial stdio -dtb /lib/firmware/{}/device-tree/vexpress-v2p-ca15-tc1.dtb -initrd /boot/initrd.img -net nic -net user,net={},host={},hostfwd={} -drive file={},if=sd,cache=writeback {} -display none -nographic'.format("256", uname, netrange, image_ip, hostfwd, data_disk, cloud_disk) else: params = \ ''' |