commit 53d835e01d024e176c282bcfdff88a4667097ff1
author Frederick Mayle <fmayle@google.com> Wed Dec 18 14:28:13 2024 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Dec 18 14:28:13 2024 -0800
tree 0fd0e7f66244fc83445039673dc99e1b56c5e046
parent 50cc92e9294b04d6c2fe29af1f4e3c26213cb73c
parent a403e5114750a0a410e6456ed98b9d2eb491044c

Merge "disable balloon device for trusty and rialto" into main am: a403e51147

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

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

guest/trusty/security_vm/launcher/src/main.rs

diff --git a/guest/trusty/security_vm/launcher/src/main.rs b/guest/trusty/security_vm/launcher/src/main.rs
index 62febf4..8dd7c43 100644
--- a/guest/trusty/security_vm/launcher/src/main.rs
+++ b/guest/trusty/security_vm/launcher/src/main.rs
@@ -88,7 +88,6 @@
         memoryMib: args.memory_size_mib,
         cpuTopology: args.cpu_topology,
         platformVersion: "~1.0".to_owned(),
-        balloon: true, // TODO: probably don't want ballooning.
         // TODO: add instanceId
         ..Default::default()
     });

libs/libservice_vm_manager/src/lib.rs

diff --git a/libs/libservice_vm_manager/src/lib.rs b/libs/libservice_vm_manager/src/lib.rs
index 5bb97d7..0f322bb 100644
--- a/libs/libservice_vm_manager/src/lib.rs
+++ b/libs/libservice_vm_manager/src/lib.rs
@@ -238,8 +238,7 @@
         memoryMib: VM_MEMORY_MB,
         cpuTopology: CpuTopology::ONE_CPU,
         platformVersion: "~1.0".to_string(),
-        gdbPort: 0,    // No gdb
-        balloon: true, // TODO: probably don't want ballooning.
+        gdbPort: 0, // No gdb
         ..Default::default()
     });
     let console_out = Some(android_log_fd()?);