Skip to content

Commit

Permalink
Merge pull request #155 from 00xc/mm/pgtable
Browse files Browse the repository at this point in the history
svsm: fix CI failures
  • Loading branch information
joergroedel authored Nov 20, 2023
2 parents f6a8342 + dc50a07 commit 98ef230
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
5 changes: 2 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
// Author: Nicolai Stange <[email protected]>

#![no_std]
// FIXME: Re-enable these when MM code has implemented the needed traits
//#![deny(missing_copy_implementations)]
//#![deny(missing_debug_implementations)]
#![deny(missing_copy_implementations)]
#![deny(missing_debug_implementations)]
#![cfg_attr(all(test, test_in_svsm), no_main)]
#![cfg_attr(all(test, test_in_svsm), feature(custom_test_frameworks))]
#![cfg_attr(all(test, test_in_svsm), test_runner(crate::testing::svsm_test_runner))]
Expand Down
1 change: 1 addition & 0 deletions src/mm/vm/mapping/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use alloc::boxed::Box;
use alloc::sync::Arc;

/// Information required to resolve a page fault within a virtual mapping
#[derive(Debug, Copy, Clone)]
pub struct VMPageFaultResolution {
/// The physical address of a page that must be mapped to the page fault
/// virtual address to resolve the page fault.
Expand Down
2 changes: 1 addition & 1 deletion src/mm/vm/mapping/file_mapping.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ impl VirtualMapping for VMWriteFileMapping {
}
}

#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Copy, Clone)]
pub enum VMFileMappingPermission {
/// Read-only access to the file
Read,
Expand Down
4 changes: 2 additions & 2 deletions src/mm/vm/range.rs
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,8 @@ impl VMR {
/// Notify the range that a page fault has occurred. This should be called from
/// the page fault handler. The mappings withing this virtual memory region are
/// examined and if they overlap with the page fault address then
/// [`VirtualMemoryRange::handle_page_fault()`] is called to handle the page
/// fault within that range.
/// [`VMR::handle_page_fault()`] is called to handle the page fault within that
/// range.
///
/// # Arguments
///
Expand Down

0 comments on commit 98ef230

Please sign in to comment.