commit 109cdfa43ed416a5299825337978fec9c3eeff1c
author Hung Nguyen <hungmn@google.com> Fri Dec 06 11:02:44 2024 -0800
committer Hung Nguyen <hungmn@google.com> Wed Jan 08 18:44:56 2025 -0800
tree 3e617af9471bff98643e218af27509059d146181
parent 5b7b49452ef0ad6bd7922b0353cd9ddab7498c6e

Add support for autoclear flag for loopdevice

Returning a struct with the File reference instead of just a device path
to make sure autoclear loop device is not automatically cleared once the
attach function returns.

Also add host supported attribute for libdm since the library should
work on the host.

Bug: 375432644
Test: atest libdm_rust.test; atest apkdmverity.test

Change-Id: I223fe2eff056fb6ca86df64e871825f9b04881d7

libs/devicemapper/src/lib.rs

diff --git a/libs/devicemapper/src/lib.rs b/libs/devicemapper/src/lib.rs
index a8f3049..a8c2833 100644
--- a/libs/devicemapper/src/lib.rs
+++ b/libs/devicemapper/src/lib.rs
@@ -235,6 +235,7 @@
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::loopdevice::LoopConfigOptions;
     use crypt::{CipherType, DmCryptTargetBuilder};
     use rdroidtest::{ignore_if, rdroidtest};
     use rustutils::system_properties;
@@ -328,10 +329,10 @@
             backing_file,
             0,
             sz,
-            /* direct_io */ true,
-            /* writable */ true,
+            &LoopConfigOptions { direct_io: true, writable: true, ..Default::default() },
         )
-        .unwrap();
+        .unwrap()
+        .path;
         let device_diff = device.to_owned() + "_diff";
 
         scopeguard::defer! {
@@ -372,10 +373,10 @@
             backing_file,
             0,
             sz,
-            /* direct_io */ true,
-            /* writable */ true,
+            &LoopConfigOptions { direct_io: true, writable: true, ..Default::default() },
         )
-        .unwrap();
+        .unwrap()
+        .path;
         let device_diff = device.to_owned() + "_diff";
         scopeguard::defer! {
             loopdevice::detach(&data_device).unwrap();