commit cc4e2d7a157123e33c4b1f15021f4dde49f86bd0
author Frederick Mayle <fmayle@google.com> Fri Dec 06 16:54:40 2024 -0800
committer Frederick Mayle <fmayle@google.com> Wed Dec 11 10:16:22 2024 -0800
tree f1e5f130ca230de1c13eca85d3f3e97350b8b7a8
parent 267fbb30e139e2a092dc40f90750401d1a19c816

disable virtio-balloon by default for VirtualMachineRawConfig

So that we don't need to add an LL-NDK API to disable it.

To reduce the impact of this change, I've kept the balloon enabled for
rialto and Trusty even though it is likely not needed.

Test: TH
Bug: 369588412
Change-Id: If22280957d735bd40e86b4d43869a4b70a233cd4

android/virtmgr/src/aidl.rs

diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 82a5573..79c7d81 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -787,7 +787,7 @@
             boost_uclamp: config.boostUclamp,
             gpu_config,
             audio_config,
-            no_balloon: config.noBalloon,
+            balloon: config.balloon,
             usb_config,
             dump_dt_fd,
         };

android/virtmgr/src/crosvm.rs

diff --git a/android/virtmgr/src/crosvm.rs b/android/virtmgr/src/crosvm.rs
index a385b82..2bfa4e1 100644
--- a/android/virtmgr/src/crosvm.rs
+++ b/android/virtmgr/src/crosvm.rs
@@ -133,7 +133,7 @@
     pub boost_uclamp: bool,
     pub gpu_config: Option<GpuConfig>,
     pub audio_config: Option<AudioConfig>,
-    pub no_balloon: bool,
+    pub balloon: bool,
     pub usb_config: UsbConfig,
     pub dump_dt_fd: Option<File>,
 }
@@ -975,8 +975,7 @@
         .arg("--cid")
         .arg(config.cid.to_string());
 
-    if system_properties::read_bool("hypervisor.memory_reclaim.supported", false)?
-        && !config.no_balloon
+    if system_properties::read_bool("hypervisor.memory_reclaim.supported", false)? && config.balloon
     {
         command.arg("--balloon-page-reporting");
     } else {