mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-19 18:01:01 +00:00
Merge pull request #11158 from RuoqingHe/2025-04-15-fix-flag-calc
runtime-rs: Use bitwise or assign for bitflags
This commit is contained in:
commit
ef12dcd7da
@ -170,7 +170,7 @@ fn generate_route(name: &str, route_msg: &RouteMessage) -> Result<Option<Route>>
|
|||||||
|
|
||||||
let mut flags: u32 = 0;
|
let mut flags: u32 = 0;
|
||||||
for flag in &route_msg.header.flags {
|
for flag in &route_msg.header.flags {
|
||||||
flags += u32::from(*flag);
|
flags |= u32::from(*flag);
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut route = Route {
|
let mut route = Route {
|
||||||
|
@ -60,7 +60,7 @@ impl TryFrom<AddressMessage> for Address {
|
|||||||
//thus here just implemeted a simple transformer.
|
//thus here just implemeted a simple transformer.
|
||||||
let mut d: u32 = 0;
|
let mut d: u32 = 0;
|
||||||
for flag in &f {
|
for flag in &f {
|
||||||
d += u32::from(*flag);
|
d |= u32::from(*flag);
|
||||||
}
|
}
|
||||||
addr.flags = d;
|
addr.flags = d;
|
||||||
}
|
}
|
||||||
|
@ -16,7 +16,7 @@ impl From<&VecLinkFlag> for u32 {
|
|||||||
fn from(v: &VecLinkFlag) -> u32 {
|
fn from(v: &VecLinkFlag) -> u32 {
|
||||||
let mut d: u32 = 0;
|
let mut d: u32 = 0;
|
||||||
for flag in &v.0 {
|
for flag in &v.0 {
|
||||||
d += u32::from(*flag);
|
d |= u32::from(*flag);
|
||||||
}
|
}
|
||||||
d
|
d
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user