Merge "libavf: remove AVirtualMachineRawConfig_setBalloon" into main
diff --git a/libs/libavf/include/android/virtualization.h b/libs/libavf/include/android/virtualization.h
index ac46fca..85bf3a2 100644
--- a/libs/libavf/include/android/virtualization.h
+++ b/libs/libavf/include/android/virtualization.h
@@ -139,15 +139,6 @@
bool protectedVm) __INTRODUCED_IN(36);
/**
- * Set whether a virtual machine uses memory ballooning.
- *
- * \param config a virtual machine config object.
- * \param balloon whether the virtual machine should use memory ballooning.
- */
-void AVirtualMachineRawConfig_setBalloon(AVirtualMachineRawConfig* _Nonnull config, bool balloon)
- __INTRODUCED_IN(36);
-
-/**
* Set whether to use an alternate, hypervisor-specific authentication method
* for protected VMs.
*
diff --git a/libs/libavf/libavf.map.txt b/libs/libavf/libavf.map.txt
index ecb4cc9..f476566 100644
--- a/libs/libavf/libavf.map.txt
+++ b/libs/libavf/libavf.map.txt
@@ -9,7 +9,6 @@
AVirtualMachineRawConfig_addDisk; # apex llndk
AVirtualMachineRawConfig_setMemoryMib; # apex llndk
AVirtualMachineRawConfig_setProtectedVm; # apex llndk
- AVirtualMachineRawConfig_setBalloon; # apex llndk
AVirtualMachineRawConfig_setHypervisorSpecificAuthMethod; # apex llndk
AVirtualMachineRawConfig_addCustomMemoryBackingFile; # apex llndk
AVirtualizationService_create; # apex llndk
diff --git a/libs/libavf/src/lib.rs b/libs/libavf/src/lib.rs
index b1edf29..5988fae 100644
--- a/libs/libavf/src/lib.rs
+++ b/libs/libavf/src/lib.rs
@@ -205,21 +205,6 @@
config.protectedVm = protected_vm;
}
-/// Set whether a virtual machine uses memory ballooning or not.
-///
-/// # Safety
-/// `config` must be a pointer returned by `AVirtualMachineRawConfig_create`.
-#[no_mangle]
-pub unsafe extern "C" fn AVirtualMachineRawConfig_setBalloon(
- config: *mut VirtualMachineRawConfig,
- balloon: bool,
-) {
- // SAFETY: `config` is assumed to be a valid, non-null pointer returned by
- // AVirtualMachineRawConfig_create. It's the only reference to the object.
- let config = unsafe { &mut *config };
- config.balloon = balloon;
-}
-
/// NOT IMPLEMENTED.
///
/// # Returns