Skip to content

Commit e8477f8

Browse files
committed
refactor(board): move Coco initialization to the Board constructor
Signed-off-by: Changyuan Lyu <changyuanl@google.com>
1 parent 7cc11cb commit e8477f8

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

alioth/src/board/board.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,9 @@ where
272272
}),
273273
cond_var: Condvar::new(),
274274
};
275+
276+
board.coco_init()?;
277+
275278
Ok(board)
276279
}
277280

@@ -429,7 +432,6 @@ where
429432

430433
fn boot_init_sync(&self, index: u16, vcpu: &mut V::Vcpu) -> Result<()> {
431434
let vcpus = self.vcpus.read();
432-
self.coco_init(index)?;
433435
if index == 0 {
434436
self.create_ram()?;
435437
for (port, dev) in self.io_devs.read().iter() {

alioth/src/board/board_aarch64.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ where
154154
Ok(())
155155
}
156156

157-
pub fn coco_init(&self, _id: u16) -> Result<()> {
157+
pub fn coco_init(&self) -> Result<()> {
158158
Ok(())
159159
}
160160

alioth/src/board/board_x86_64/board_x86_64.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,16 +318,14 @@ where
318318
Ok(())
319319
}
320320

321-
pub fn coco_init(&self, index: u16) -> Result<()> {
322-
if index != 0 {
321+
pub fn coco_init(&self) -> Result<()> {
322+
let Some(coco) = &self.config.coco else {
323323
return Ok(());
324-
}
325-
if let Some(coco) = &self.config.coco {
326-
match coco {
327-
Coco::AmdSev { policy } => self.vm.sev_launch_start(*policy)?,
328-
Coco::AmdSnp { policy } => self.vm.snp_launch_start(*policy)?,
329-
Coco::IntelTdx { attr } => todo!("Intel TDX {attr:?}"),
330-
}
324+
};
325+
match coco {
326+
Coco::AmdSev { policy } => self.vm.sev_launch_start(*policy)?,
327+
Coco::AmdSnp { policy } => self.vm.snp_launch_start(*policy)?,
328+
Coco::IntelTdx { attr } => todo!("Intel TDX {attr:?}"),
331329
}
332330
Ok(())
333331
}

0 commit comments

Comments
 (0)