diff options
| author | biao716.wang <biao716.wang@samsung.com> | 2021-09-04 18:01:25 +0900 |
|---|---|---|
| committer | biao716.wang <biao716.wang@samsung.com> | 2021-09-04 18:01:25 +0900 |
| commit | 967987d7b7afa51ea7c9fed4aaade0ce76458d10 (patch) | |
| tree | 012e4e16e3c7383e7727f32e93401d31d6fa5fb3 /build-vm-kvm | |
| parent | 9b7337b849b6f36d23495e8563c1c40bee248c84 (diff) | |
| parent | bf5939e0d9ecf95ebda3e5c96464f9e8724bb8b1 (diff) | |
| download | build-accepted/tizen/devbase/tools/20211013.010747.tar.gz build-accepted/tizen/devbase/tools/20211013.010747.tar.bz2 build-accepted/tizen/devbase/tools/20211013.010747.zip | |
Merge remote-tracking branch 'origin/devel'submit/trunk/20211013.141059submit/trunk/20211013.113059submit/trunk/20211013.111059submit/trunk/20211013.103059submit/trunk/20211012.195059submit/trunk/20211012.140030submit/trunk/20211012.135059submit/trunk/20211012.133030submit/trunk/20211012.103030submit/trunk/20211012.095030submit/trunk/20211012.085030submit/trunk/20210903.134030accepted/tizen/devbase/tools/20211013.084003accepted/tizen/devbase/tools/20211013.010747accepted/tizen/devbase/tools/20211012.121058accepted/tizen/devbase/tools/20210903.085140
Change-Id: I7040cf26129d1195e593126be125efcdeab2a181
Diffstat (limited to 'build-vm-kvm')
| -rw-r--r-- | build-vm-kvm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build-vm-kvm b/build-vm-kvm index 641bc4d..c557317 100644 --- a/build-vm-kvm +++ b/build-vm-kvm @@ -22,6 +22,7 @@ ################################################################ kvm_bin=/usr/bin/qemu-kvm +test ! -x $kvm_bin -a -x /usr/bin/kvm && kvm_bin=/usr/bin/kvm kvm_console=ttyS0 # assume virtio support by default @@ -214,7 +215,7 @@ vm_verify_options_kvm() { vm_startup_kvm() { qemu_bin="$kvm_bin" - qemu_args=(-drive file="$VM_IMAGE",format=raw,if=none,id=disk,serial=0,cache=unsafe -device "$kvm_device",drive=disk) + qemu_args=(-drive file="$VM_IMAGE",format=raw,if=none,id=disk,cache=unsafe -device "$kvm_device",drive=disk,serial=0) if [ -n "$VM_USER" ] ; then getent passwd "$VM_USER" > /dev/null || complain 22 "cannot find KVM user '$VM_USER'" else @@ -223,7 +224,7 @@ vm_startup_kvm() { fi [ -n "$VM_USER" ] && kvm_options="$kvm_options -runas $VM_USER" if test -n "$VM_SWAP" ; then - qemu_args=("${qemu_args[@]}" -drive file="$VM_SWAP",format=raw,if=none,id=swap,serial=1,cache=unsafe -device "$kvm_device",drive=swap) + qemu_args=("${qemu_args[@]}" -drive file="$VM_SWAP",format=raw,if=none,id=swap,cache=unsafe -device "$kvm_device",drive=swap,serial=1) fi # the serial console device needs to be compiled into the target kernel # which is why we can not use virtio-serial on other platforms |