commit 177a211278dd56739827e876d64b9295d603197b
author Pierre-Clément Tosi <ptosi@google.com> Wed Jan 08 02:48:25 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 08 02:48:25 2025 -0800
tree 8ce6aad4a92b49772157776271e77fa9257a3272
parent 3ac91af668e338e12a4a590d1e889e4487c237a5
parent 3d70d465dcb197491be87ba865c7895a226d61df

Merge "virtmgr: Don't detect hangup when using GDB" into main

android/virtmgr/src/aidl.rs

diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 5ad7ee1..57779bf 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -819,6 +819,8 @@
             .unwrap_or(Ok(UsbConfig { controller: false }))
             .or_binder_exception(ExceptionCode::BAD_PARCELABLE)?;
 
+        let detect_hangup = is_app_config && gdb_port.is_none();
+
         // Actually start the VM.
         let crosvm_config = CrosvmConfig {
             cid,
@@ -846,7 +848,7 @@
             ramdump,
             indirect_files,
             platform_version: parse_platform_version_req(&config.platformVersion)?,
-            detect_hangup: is_app_config,
+            detect_hangup,
             gdb_port,
             vfio_devices,
             dtbo,