commit c49f39653870bbaa99d61c3d2672c7ad33920530
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Mar 06 21:39:16 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 06 21:39:16 2025 -0800
tree 0ca4038d9398ddbe1c2ae9af45127734233cc466
parent 5febbd11aef6f4024141145d8c4b1c84a70524cc
parent 3ab3e6d47c6d52da20852c9b0302796ab1176348

Merge "vm_shell: fix connect when multiple VMs are present" into main am: 3ab3e6d47c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3528399

Change-Id: I9a0a52bc026eae9efc2217104746365e0bdfd524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/vm/vm_shell.sh

diff --git a/android/vm/vm_shell.sh b/android/vm/vm_shell.sh
index 60d9329..cac5781 100755
--- a/android/vm/vm_shell.sh
+++ b/android/vm/vm_shell.sh
@@ -50,15 +50,13 @@
 }
 
 function list_cids() {
-    local selected_cid=$1
-    local available_cids=$(adb shell /apex/com.android.virt/bin/vm list | awk 'BEGIN { FS="[:,]" } /cid/ { print $2; }')
-    echo "${available_cids}"
+    adb shell /apex/com.android.virt/bin/vm list | awk 'BEGIN { FS="[:,]" } /cid/ { print $2; }'
 }
 
 function handle_connect_cmd() {
     selected_cid=$1
 
-    available_cids=$(list_cids)
+    available_cids=($(list_cids))
 
     if [ -z "${available_cids}" ]; then
         echo No VM is available
@@ -66,11 +64,11 @@
     fi
 
     if [ ! -n "${selected_cid}" ]; then
-        if [ ${#selected_cid[@]} -eq 1 ]; then
+        if [ ${#available_cids[@]} -eq 1 ]; then
             selected_cid=${available_cids[0]}
         else
             PS3="Select CID of VM to adb-shell into: "
-            select cid in ${available_cids}
+            select cid in ${available_cids[@]}
             do
                 selected_cid=${cid}
                 break