diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-10-10 00:30:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-10-10 00:30:26 +0000 |
| commit | afe16976ee122bb10ebd8b590a77bbb07dfa9e0c (patch) | |
| tree | bb33c4543e870d171c4926913e6da95f438c5301 | |
| parent | 810f1a06df7329e239418b30ffcc10c52e066543 (diff) | |
| parent | df2b936df566a5bf2c49b334ae239e97143dd35b (diff) | |
| download | cuttlefish_common-ndk-sysroot-r21.tar.gz | |
Merge "Make default paths in cf_qemu.sh match those in the launcher"ndk-sysroot-r21
| -rwxr-xr-x | host/libs/vm_manager/cf_qemu.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/libs/vm_manager/cf_qemu.sh b/host/libs/vm_manager/cf_qemu.sh index 569ab8b3..75707eda 100755 --- a/host/libs/vm_manager/cf_qemu.sh +++ b/host/libs/vm_manager/cf_qemu.sh @@ -141,13 +141,13 @@ if [[ "${use_bootloader}" = "true" ]]; then fi args+=( - -chardev "socket,id=charmonitor,path=${monitor_path:-${default_internal_dir}/_qemu_monitor.sock},server,nowait" + -chardev "socket,id=charmonitor,path=${monitor_path:-${default_internal_dir}/qemu_monitor.sock},server,nowait" -mon "chardev=charmonitor,id=monitor,mode=control" - -chardev "file,id=charserial0,path=${kernel_log_pipe_name:-${default_internal_dir}/_kernel-log},append=on" + -chardev "file,id=charserial0,path=${kernel_log_pipe_name:-${default_internal_dir}/kernel-log},append=on" -device "${kernel_console_serial},chardev=charserial0,id=serial0" -chardev "socket,id=charserial1,path=${console_path:-${default_dir}/console},server,nowait" -device "${kernel_console_serial},chardev=charserial1,id=serial1" - -chardev "socket,path=${ivshmem_qemu_socket_path:-${default_internal_dir}/_ivshmem_socket_qemu},id=ivsocket" + -chardev "socket,path=${ivshmem_qemu_socket_path:-${default_internal_dir}/ivshmem_socket_qemu},id=ivsocket" -device "ivshmem-doorbell,chardev=ivsocket,vectors=${ivshmem_vector_count}" ) @@ -168,7 +168,7 @@ fi if [[ -n "${usb_v1_socket_name}" ]]; then args+=( - -chardev "socket,id=charchannel1,path=${usb_v1_socket_name:-${default_internal_dir}/_usb-v1}" + -chardev "socket,id=charchannel1,path=${usb_v1_socket_name:-${default_internal_dir}/usb-v1}" -device "virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=cf-gadget-usb-v1" ) fi |