File tree 3 files changed +17
-2
lines changed
3 files changed +17
-2
lines changed Original file line number Diff line number Diff line change @@ -119,6 +119,11 @@ jobs:
119
119
- name : Touch libtcgtpm bindings
120
120
run : echo "" > libtcgtpm/src/bindings.rs
121
121
122
+ # release/src/git_version.rs is auto-generated via a build.rs file. Touch
123
+ # it here to avoid CI failures.
124
+ - name : Touch release/src/git_version.rs
125
+ run : echo "" > release/src/git_version.rs
126
+
122
127
- name : Format doctests
123
128
uses : actions-rs/cargo@v1
124
129
with :
Original file line number Diff line number Diff line change @@ -40,6 +40,8 @@ use svsm::platform::{
40
40
use svsm:: types:: { PageSize , PAGE_SIZE , PAGE_SIZE_2M } ;
41
41
use svsm:: utils:: { is_aligned, MemoryRegion } ;
42
42
43
+ use release:: COCONUT_VERSION ;
44
+
43
45
extern "C" {
44
46
static mut pgtable: PageTable ;
45
47
}
@@ -476,7 +478,8 @@ pub extern "C" fn stage2_main(launch_info: &Stage2LaunchInfo) {
476
478
477
479
#[ panic_handler]
478
480
fn panic ( info : & PanicInfo < ' _ > ) -> ! {
479
- log:: error!( "Panic: {}" , info) ;
481
+ log:: error!( "Panic! COCONUT-SVSM Version: {}" , COCONUT_VERSION ) ;
482
+ log:: error!( "Info: {}" , info) ;
480
483
loop {
481
484
platform:: halt ( ) ;
482
485
}
Original file line number Diff line number Diff line change @@ -53,6 +53,8 @@ use svsm::vtpm::vtpm_init;
53
53
54
54
use svsm:: mm:: validate:: { init_valid_bitmap_ptr, migrate_valid_bitmap} ;
55
55
56
+ use release:: COCONUT_VERSION ;
57
+
56
58
use alloc:: string:: String ;
57
59
58
60
extern "C" {
@@ -354,7 +356,12 @@ fn panic(info: &PanicInfo<'_>) -> ! {
354
356
secrets_page_mut ( ) . clear_vmpck ( 2 ) ;
355
357
secrets_page_mut ( ) . clear_vmpck ( 3 ) ;
356
358
357
- log:: error!( "Panic: CPU[{}] {}" , this_cpu( ) . get_apic_id( ) , info) ;
359
+ log:: error!(
360
+ "Panic on CPU[{}]! COCONUT-SVSM Version: {}" ,
361
+ this_cpu( ) . get_apic_id( ) ,
362
+ COCONUT_VERSION
363
+ ) ;
364
+ log:: error!( "Info: {}" , info) ;
358
365
359
366
print_stack ( 3 ) ;
360
367
You can’t perform that action at this time.
0 commit comments