File tree Expand file tree Collapse file tree 3 files changed +19
-17
lines changed Expand file tree Collapse file tree 3 files changed +19
-17
lines changed Original file line number Diff line number Diff line change @@ -331,9 +331,9 @@ impl Cmdline {
331
331
}
332
332
}
333
333
334
- impl Into < Vec < u8 > > for Cmdline {
335
- fn into ( self ) -> Vec < u8 > {
336
- self . line . into_bytes ( )
334
+ impl From < Cmdline > for Vec < u8 > {
335
+ fn from ( cmdline : Cmdline ) -> Vec < u8 > {
336
+ cmdline . line . into_bytes ( )
337
337
}
338
338
}
339
339
Original file line number Diff line number Diff line change @@ -159,9 +159,11 @@ impl KernelLoader for BzImage {
159
159
160
160
boot_header. code32_start = mem_offset. raw_value ( ) as u32 ;
161
161
162
- let mut loader_result: KernelLoaderResult = Default :: default ( ) ;
163
- loader_result. setup_header = Some ( boot_header) ;
164
- loader_result. kernel_load = mem_offset;
162
+ let mut loader_result = KernelLoaderResult {
163
+ setup_header : Some ( boot_header) ,
164
+ kernel_load : mem_offset,
165
+ ..Default :: default ( )
166
+ } ;
165
167
166
168
// Seek the compressed `vmlinux.bin` and read it to memory.
167
169
kernel_image
Original file line number Diff line number Diff line change @@ -219,17 +219,17 @@ impl KernelLoader for Elf {
219
219
}
220
220
}
221
221
222
- let mut loader_result: KernelLoaderResult = Default :: default ( ) ;
223
-
224
- // Address where the kernel will be loaded.
225
- loader_result . kernel_load = match kernel_offset {
226
- Some ( k_offset ) => GuestAddress (
227
- k_offset
228
- . raw_value ( )
229
- . checked_add ( ehdr . e_entry as u64 )
230
- . ok_or ( Error :: Overflow ) ? ,
231
- ) ,
232
- None => GuestAddress ( ehdr . e_entry as u64 ) ,
222
+ let mut loader_result = KernelLoaderResult {
223
+ kernel_load : match kernel_offset {
224
+ Some ( k_offset ) => GuestAddress (
225
+ k_offset
226
+ . raw_value ( )
227
+ . checked_add ( ehdr . e_entry as u64 )
228
+ . ok_or ( Error :: Overflow ) ? ,
229
+ ) ,
230
+ None => GuestAddress ( ehdr . e_entry as u64 ) ,
231
+ } ,
232
+ .. Default :: default ( )
233
233
} ;
234
234
235
235
kernel_image
You can’t perform that action at this time.
0 commit comments