commit 2cac253eccac706bcaebc14fe94564500a6ebf78
author Shikha Panwar <shikhapanwar@google.com> Thu Oct 12 11:24:42 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 12 11:24:42 2023 +0000
tree 99dfe95e6340eb6f5fd3eb56938b39e0e92229ed
parent 8e6674b60bdf5dc55139a0fdbbadd1bc986e9212
parent 35cbe0bbdc9f6fec1e77338303eb11c228cd3012

[automerger skipped] Revert^2 "Skip changingDebuggability related tests on Non-pVM" am: b3fcdc1566 -s ours am: 35cbe0bbdc -s ours

am skip reason: Merged-In Ic2818a8f513c778ad1f5217d3641398c8df1719d with SHA-1 4386ffd7c7 is already in history

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

Change-Id: I70552ef0c18e9af1beeb390fb93a2f8f2e8368e7
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;