Merge pull request #80 from stefano-garzarella/bitflags-2

Update `bitflags` crate to 2.4.0

.github/workflows/rust.yml

@@ -46,4 +46,4 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --all-features -- -D warnings -A clippy::bad_bit_mask
+          args: --all-features -- -D warnings

Cargo.toml

@@ -18,7 +18,7 @@ test = true
 doctest = false
 
 [dependencies]
-bitflags = "1.3.2"
+bitflags = "2.4"
 gdbstub = { version = "0.6.6", default-features = false, optional = true }
 gdbstub_arch = { version = "0.2.4", optional = true }
 log = { version = "0.4.17", features = ["max_level_info", "release_max_level_info"] }

scripts/pre-commit

@@ -37,7 +37,7 @@ for file in `git diff --name-only --staged`; do
     fi
 done
 
-cargo clippy --all-features -- -D warnings -A clippy::bad_bit_mask || exit 1
+cargo clippy --all-features -- -D warnings || exit 1
 
 exit $RET
 

src/elf/mod.rs

@@ -777,6 +777,7 @@ pub struct Elf64Phdr {
 }
 
 bitflags! {
+    #[derive(Debug)]
     pub struct Elf64PhdrFlags : Elf64Word {
         const EXECUTE = 0x01;
         const WRITE   = 0x02;
@@ -866,6 +867,7 @@ pub struct Elf64Shdr {
 }
 
 bitflags! {
+    #[derive(Debug)]
     pub struct Elf64ShdrFlags : Elf64Xword {
         const WRITE            = 0x001;
         const ALLOC            = 0x002;

src/mm/pagetable.rs

@@ -108,6 +108,7 @@ fn set_c_bit(paddr: PhysAddr) -> PhysAddr {
 }
 
 bitflags! {
+    #[derive(Copy, Clone)]
     pub struct PTEntryFlags: u64 {
         const PRESENT       = 1 << 0;
         const WRITABLE      = 1 << 1;

src/sev/status.rs

@@ -11,6 +11,7 @@ use core::fmt::{self, Write};
 use log;
 
 bitflags! {
+    #[derive(Copy, Clone, PartialEq, Eq)]
     pub struct SEVStatusFlags: u64 {
         const SEV           = 1 << 0;
         const SEV_ES        = 1 << 1;

src/sev/utils.rs

@@ -4,9 +4,6 @@
 //
 // Author: Joerg Roedel <jroedel@suse.de>
 
-// For bitflags definitions
-#![allow(clippy::bad_bit_mask)]
-
 use crate::address::{Address, VirtAddr};
 use crate::error::SvsmError;
 use crate::types::{GUEST_VMPL, PAGE_SIZE, PAGE_SIZE_2M};
@@ -141,8 +138,8 @@ bitflags::bitflags! {
         const X_SUPER = 1u64 << 11;
         const BIT_VMSA = 1u64 << 16;
         const NONE = 0;
-        const RWX = Self::READ.bits | Self::WRITE.bits | Self::X_USER.bits | Self::X_SUPER.bits;
-        const VMSA = Self::READ.bits | Self::BIT_VMSA.bits;
+        const RWX = Self::READ.bits() | Self::WRITE.bits() | Self::X_USER.bits() | Self::X_SUPER.bits();
+        const VMSA = Self::READ.bits() | Self::BIT_VMSA.bits();
     }
 }