commit 7e38cdf347b6011112ddee6c40271b986ac9508d
author Steven Moreland <smoreland@google.com> Tue Apr 15 17:48:48 2025 +0000
committer Steven Moreland <smoreland@google.com> Tue Apr 15 20:09:08 2025 +0000
tree 410f985a45e76e5e684445192419e0e8a9edd6f5
parent 5cc172dbc92a2351cf1cd337caf0024b277b1e2d

clarify name to getActualMemoryBalloonBytes

Clarify this is the current amount and clarify
units.

Fixes: 410657609
Test: N/A
Change-Id: Ic8915f889941ffe3485ba7f0abcd781da9f0a41c

android/virtmgr/src/aidl.rs

diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 161a534..ac908ce 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -1797,10 +1797,10 @@
         Ok(self.instance.balloon_enabled)
     }
 
-    fn getMemoryBalloon(&self) -> binder::Result<i64> {
+    fn getActualMemoryBalloonBytes(&self) -> binder::Result<i64> {
         let balloon = self
             .instance
-            .get_memory_balloon()
+            .get_actual_memory_balloon_bytes()
             .with_context(|| format!("Error getting balloon for VM with CID {}", self.instance.cid))
             .with_log()
             .or_service_specific_exception(-1)?;

android/virtmgr/src/crosvm.rs

diff --git a/android/virtmgr/src/crosvm.rs b/android/virtmgr/src/crosvm.rs
index 7d1bcc9..3553a28 100644
--- a/android/virtmgr/src/crosvm.rs
+++ b/android/virtmgr/src/crosvm.rs
@@ -740,9 +740,9 @@
     }
 
     /// Returns current virtio-balloon size.
-    pub fn get_memory_balloon(&self) -> Result<u64, Error> {
+    pub fn get_actual_memory_balloon_bytes(&self) -> Result<u64, Error> {
         if !self.is_vm_running() {
-            bail!("get_memory_balloon when VM is not running");
+            bail!("get_actual_memory_balloon_bytes when VM is not running");
         }
         if !self.balloon_enabled {
             bail!("virtio-balloon is not enabled");

android/virtualizationservice/aidl/android/system/virtualizationservice/IVirtualMachine.aidl

diff --git a/android/virtualizationservice/aidl/android/system/virtualizationservice/IVirtualMachine.aidl b/android/virtualizationservice/aidl/android/system/virtualizationservice/IVirtualMachine.aidl
index e7aeefd..a2273b2 100644
--- a/android/virtualizationservice/aidl/android/system/virtualizationservice/IVirtualMachine.aidl
+++ b/android/virtualizationservice/aidl/android/system/virtualizationservice/IVirtualMachine.aidl
@@ -50,7 +50,7 @@
 
     /** Access to the VM's memory balloon. */
     boolean isMemoryBalloonEnabled();
-    long getMemoryBalloon();
+    long getActualMemoryBalloonBytes();
     void setMemoryBalloon(long num_bytes);
 
     /** Open a vsock connection to the CID of the VM on the given port. */

libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java

diff --git a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
index 1c41655..41e4ce4 100644
--- a/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
+++ b/libs/framework-virtualization/src/android/system/virtualmachine/VirtualMachine.java
@@ -1387,21 +1387,21 @@
     }
 
     /** @hide */
-    public long getMemoryBalloon() {
+    public long getActualMemoryBalloonBytes() {
         long bytes = 0;
 
         if (mMemoryManagementCallbacks != null) {
-            Log.d(TAG, "Auto balloon enabled in getMemoryBalloon");
+            Log.d(TAG, "Auto balloon enabled in getActualMemoryBalloonBytes");
             return bytes;
         }
 
         synchronized (mLock) {
             try {
                 if (mVirtualMachine != null) {
-                    bytes = mVirtualMachine.getMemoryBalloon();
+                    bytes = mVirtualMachine.getActualMemoryBalloonBytes();
                 }
             } catch (RemoteException e) {
-                Log.w(TAG, "Cannot getMemoryBalloon", e);
+                Log.w(TAG, "Cannot getActualMemoryBalloonBytes", e);
             }
         }