diff options
author | dann frazier <dann.frazier@canonical.com> | 2014-04-29 10:11:25 -0600 |
---|---|---|
committer | dann frazier <dann.frazier@canonical.com> | 2014-04-29 10:11:25 -0600 |
commit | eebb1728a13a17708a13362b0c1c0d8519ab8e5b (patch) | |
tree | 711239994a402c811c9b9c6096258157addaa868 | |
parent | 1df36e373de7979c438bc99fc892cdc861d11a69 (diff) |
Don't use ARMv7 qemu invocation on aarch64
There's no guarantee that a given aarch64 target actually supports ARMv7 instructions, and it probably isn't what we want to be testing anyway. Rather, we probably want to test that aarch64 guests work on an aarch64 host.
-rwxr-xr-x | bin/virtualization | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/virtualization b/bin/virtualization index 5ad5bbe..95bd706 100755 --- a/bin/virtualization +++ b/bin/virtualization @@ -119,7 +119,7 @@ class KVMTest(object): logging.debug("Attaching Cloud config disk") cloud_disk = "-drive file=seed.iso,if=virtio" - if re.match("(arm.*|aarch64)", self.arch): + if re.match("arm.*", 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("256", uname, netrange, image_ip, hostfwd, data_disk, cloud_disk) |