@@ -273,7 +273,7 @@ impl<'dr> VmConfig<'dr> {
273
273
// name. It then derives a backend name from the disk name. Match
274
274
// that name derivation here so PHD tests match the API as used by
275
275
// Nexus.
276
- let backend_name = format ! ( "{}-backend" , device_name) ;
276
+ let backend_name = device_name_to_backend_name ( device_name) ;
277
277
let device_spec = match req. interface {
278
278
DiskInterface :: Virtio => {
279
279
StorageDeviceV0 :: VirtioDisk ( VirtioDisk {
@@ -333,23 +333,29 @@ impl<'dr> VmConfig<'dr> {
333
333
}
334
334
}
335
335
336
+ fn device_name_to_backend_name ( device_name : & str ) -> String {
337
+ format ! ( "{}-backend" , device_name)
338
+ }
339
+
336
340
async fn make_disk < ' req > (
337
- name : String ,
341
+ device_name : String ,
338
342
framework : & Framework ,
339
343
req : & DiskRequest < ' req > ,
340
344
) -> anyhow:: Result < Arc < dyn DiskConfig > > {
345
+ let backend_name = device_name_to_backend_name ( & device_name) ;
346
+
341
347
Ok ( match req. backend {
342
348
DiskBackend :: File => framework
343
349
. disk_factory
344
- . create_file_backed_disk ( name , & req. source )
350
+ . create_file_backed_disk ( backend_name , & req. source )
345
351
. await
346
352
. with_context ( || {
347
353
format ! ( "creating new file-backed disk from {:?}" , req. source, )
348
354
} ) ? as Arc < dyn DiskConfig > ,
349
355
DiskBackend :: Crucible { min_disk_size_gib, block_size } => framework
350
356
. disk_factory
351
357
. create_crucible_disk (
352
- name ,
358
+ backend_name ,
353
359
& req. source ,
354
360
min_disk_size_gib,
355
361
block_size,
@@ -364,7 +370,7 @@ async fn make_disk<'req>(
364
370
as Arc < dyn DiskConfig > ,
365
371
DiskBackend :: InMemory { readonly } => framework
366
372
. disk_factory
367
- . create_in_memory_disk ( name , & req. source , readonly)
373
+ . create_in_memory_disk ( backend_name , & req. source , readonly)
368
374
. await
369
375
. with_context ( || {
370
376
format ! ( "creating new in-memory disk from {:?}" , req. source)
0 commit comments