Usually I build QEMU in a system which doesn't have any qemu package installed. When I need to `make vm-build-something` it fails due system-qemu-<arch> and qemu-img not found system-wide (and I want to use the built binaries). The formed can be set with QEMU env var, but the later can't. So this patch allows to set the path to qemu-img using yet another env var.
Git: - Tree: https://github.com/wainersm/qemu - Branch: https://github.com/wainersm/qemu/tree/test_vm_qemu-img Travis: - (FAIL) https://travis-ci.org/wainersm/qemu/builds/611563267 Two build jobs reached timeout. Not related with this change though. Bug found: I realized that when I export QEMU it is always overwritten with <BUILD>/qemu/xtensa-linux-user/qemu-xtensa See the error below. --- [root@localhost qemu]# export QEMU_IMG=$PWD/qemu-img [root@localhost qemu]# export QEMU=$PWD/x86_64-softmmu/qemu-system-x86_64 [root@localhost qemu]# make vm-build-fedora VM-IMAGE fedora ### Downloading install iso ... ### Preparing iso and disk image ... Formatting '/root/.cache/qemu-vm/images/fedora.img.tmp', fmt=qcow2 size=21474836480 cluster_size=65536 lazy_refcounts=off refcount_bits=16 ### Booting installer ... ERROR:root:Failed to launch QEMU, command line: ERROR:root:/root/build/qemu/xtensa-linux-user/qemu-xtensa -nodefaults -m 4G -cpu max -netdev user,id=vnet,hostfwd=:127.0.0.1:0-:22 -device virtio-net-pci,netdev=vnet -vnc 127.0.0.1:0,to=20 -smp 8 -enable-kvm -device VGA -drive file=/root/.cache/qemu-vm/images/fedora.img.tmp,if=none,id=drive0,cache=writeback -device virtio-blk,drive=drive0,bootindex=0 -bios pc-bios/bios-256k.bin -machine graphics=off -cdrom /root/.cache/qemu-vm/images/fedora.img.install.iso ERROR:root:Log: ERROR:root:qemu: unknown option 'chardev' --- Wainer dos Santos Moschetta (1): tests/vm: Allow to set qemu-img path docs/devel/testing.rst | 6 ++++-- tests/vm/Makefile.include | 1 + tests/vm/basevm.py | 5 +++++ tests/vm/centos | 2 +- tests/vm/fedora | 4 +--- tests/vm/freebsd | 3 +-- tests/vm/netbsd | 3 +-- tests/vm/openbsd | 3 +-- tests/vm/ubuntu.i386 | 2 +- 9 files changed, 16 insertions(+), 13 deletions(-) -- 2.18.1
