commit 33705ed411be20368b4241a477c73265b3cd2b14
author Nikita Ioffe <ioffe@google.com> Thu Dec 21 15:21:19 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Dec 21 15:21:19 2023 +0000
tree 4de0516c242bc29f3ba728bf1fb576462f4ced74
parent 61bb8b1f7d8deacdc4878e04b0c169f5646d9bbc
parent 65472a3f242f38db63a4c736f48fa5b8c0fd1c65

sign_virt_apex: add --do_not_validate_avb_version flag am: 9c4716a731 am: 65472a3f24

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

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

libs/devicemapper/src/loopdevice/sys.rs

diff --git a/libs/devicemapper/src/loopdevice/sys.rs b/libs/devicemapper/src/loopdevice/sys.rs
index 98b5085..a35eaa9 100644
--- a/libs/devicemapper/src/loopdevice/sys.rs
+++ b/libs/devicemapper/src/loopdevice/sys.rs
@@ -61,6 +61,8 @@
 unsafe impl DataInit for loop_info64 {}
 
 bitflags! {
+    #[repr(transparent)]
+    #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
     pub struct Flag: u32 {
         const LO_FLAGS_READ_ONLY = 1 << 0;
         const LO_FLAGS_AUTOCLEAR = 1 << 2;

libs/devicemapper/src/sys.rs

diff --git a/libs/devicemapper/src/sys.rs b/libs/devicemapper/src/sys.rs
index e709bf0..3cecde3 100644
--- a/libs/devicemapper/src/sys.rs
+++ b/libs/devicemapper/src/sys.rs
@@ -72,6 +72,8 @@
 pub const DM_MAX_TYPE_NAME: usize = 16;
 
 bitflags! {
+    #[repr(transparent)]
+    #[derive(Copy, Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
     pub struct Flag: u32 {
         const DM_READONLY_FLAG = 1 << 0;
         const DM_SUSPEND_FLAG = 1 << 1;