vmm: config: fix incorrect values of error

The PR #2333 added I/O rate limiter on block device, with some options
in `DiskConfig`.  And the PR #2401 added rate limiter on virtio-net
device with same options, but it still throws `Error::ParseDisk`.

This commit fixes it with correct values.

Fixes: #2401

Signed-off-by: Yu Li <liyu.yukiteru@bytedance.com>
This commit is contained in:
Yu Li 2023-02-23 11:23:55 +08:00 committed by Rob Bradford
parent 1d55de9c74
commit 74dcb37ec3

View File

@ -1010,27 +1010,27 @@ impl NetConfig {
.unwrap_or_default(); .unwrap_or_default();
let bw_size = parser let bw_size = parser
.convert("bw_size") .convert("bw_size")
.map_err(Error::ParseDisk)? .map_err(Error::ParseNetwork)?
.unwrap_or_default(); .unwrap_or_default();
let bw_one_time_burst = parser let bw_one_time_burst = parser
.convert("bw_one_time_burst") .convert("bw_one_time_burst")
.map_err(Error::ParseDisk)? .map_err(Error::ParseNetwork)?
.unwrap_or_default(); .unwrap_or_default();
let bw_refill_time = parser let bw_refill_time = parser
.convert("bw_refill_time") .convert("bw_refill_time")
.map_err(Error::ParseDisk)? .map_err(Error::ParseNetwork)?
.unwrap_or_default(); .unwrap_or_default();
let ops_size = parser let ops_size = parser
.convert("ops_size") .convert("ops_size")
.map_err(Error::ParseDisk)? .map_err(Error::ParseNetwork)?
.unwrap_or_default(); .unwrap_or_default();
let ops_one_time_burst = parser let ops_one_time_burst = parser
.convert("ops_one_time_burst") .convert("ops_one_time_burst")
.map_err(Error::ParseDisk)? .map_err(Error::ParseNetwork)?
.unwrap_or_default(); .unwrap_or_default();
let ops_refill_time = parser let ops_refill_time = parser
.convert("ops_refill_time") .convert("ops_refill_time")
.map_err(Error::ParseDisk)? .map_err(Error::ParseNetwork)?
.unwrap_or_default(); .unwrap_or_default();
let bw_tb_config = if bw_size != 0 && bw_refill_time != 0 { let bw_tb_config = if bw_size != 0 && bw_refill_time != 0 {
Some(TokenBucketConfig { Some(TokenBucketConfig {