diff --git a/src/bin/vhost_user_blk.rs b/src/bin/vhost_user_blk.rs index c7f84b65f..a2b7b2224 100644 --- a/src/bin/vhost_user_blk.rs +++ b/src/bin/vhost_user_blk.rs @@ -25,7 +25,7 @@ fn main() { .long("block-backend") .help( "vhost-user-block backend parameters \ - \"image=,sock=,num_queues=,\ + \"path=,socket=,num_queues=,\ readonly=true|false,direct=true|false,poll_queue=true|false\"", ) .takes_value(true) diff --git a/src/main.rs b/src/main.rs index 43d98445c..4208ab927 100755 --- a/src/main.rs +++ b/src/main.rs @@ -249,7 +249,7 @@ fn create_app<'a, 'b>( .long("block-backend") .help( "vhost-user-block backend parameters \ - \"image=,sock=,num_queues=,\ + \"path=,socket=,num_queues=,\ readonly=true|false,direct=true|false,poll_queue=true|false\"", ) .takes_value(true) diff --git a/tests/integration.rs b/tests/integration.rs index bc7c744bb..c2d47a0a4 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -398,7 +398,7 @@ mod tests { .args(&[ "--block-backend", format!( - "image={},sock={},num_queues={},readonly={},direct={}", + "path={},socket={},num_queues={},readonly={},direct={}", blk_file_path, vubd_socket_path, num_queues, rdonly, direct ) .as_str(), diff --git a/vhost_user_block/src/lib.rs b/vhost_user_block/src/lib.rs index 5640d2379..35dee2cfa 100644 --- a/vhost_user_block/src/lib.rs +++ b/vhost_user_block/src/lib.rs @@ -387,10 +387,10 @@ impl<'a> VhostUserBlkBackendConfig<'a> { let mut poll_queue: bool = true; for param in params_list.iter() { - if param.starts_with("image=") { - image = ¶m[6..]; - } else if param.starts_with("sock=") { - sock = ¶m[5..]; + if param.starts_with("path=") { + image = ¶m[5..]; + } else if param.starts_with("socket=") { + sock = ¶m[7..]; } else if param.starts_with("num_queues=") { num_queues_str = ¶m[11..]; } else if param.starts_with("readonly=") { diff --git a/vmm/src/device_manager.rs b/vmm/src/device_manager.rs index 60262155a..ad0a19fac 100644 --- a/vmm/src/device_manager.rs +++ b/vmm/src/device_manager.rs @@ -1167,7 +1167,7 @@ impl DeviceManager { .args(&[ "--block-backend", &format!( - "image={},sock={},num_queues={},queue_size={}", + "path={},socket={},num_queues={},queue_size={}", disk_cfg .path .as_ref()