Make default paths in cf_qemu.sh match those in the launcher
Bug: 141766622
Test: locally
Change-Id: Ie7a40f8127066957fd534ceaa6d347829079eb68
diff --git a/host/libs/vm_manager/cf_qemu.sh b/host/libs/vm_manager/cf_qemu.sh
index 569ab8b..75707ed 100755
--- a/host/libs/vm_manager/cf_qemu.sh
+++ b/host/libs/vm_manager/cf_qemu.sh
@@ -141,13 +141,13 @@
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 @@
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
