From c7559bb7a4228cf4f98352d77c1edf091de33e14 Mon Sep 17 00:00:00 2001 From: Yang Zhong Date: Tue, 10 Sep 2019 19:28:30 +0800 Subject: [PATCH] config: make error definition common Since vhost-user-blk use same error definition with vhost-user-net, those errors need define to common usage. Signed-off-by: Yang Zhong --- vmm/src/config.rs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vmm/src/config.rs b/vmm/src/config.rs index da26ec507..b1dd5e4c2 100644 --- a/vmm/src/config.rs +++ b/vmm/src/config.rs @@ -63,12 +63,12 @@ pub enum Error<'a> { ParseTTYParam, /// Failed parsing vhost-user-net mac parameter. ParseVuNetMacParam(&'a str), - /// Failed parsing vhost-user-net sock parameter. - ParseVuNetSockParam, - /// Failed parsing vhost-user-net queue number parameter. - ParseVuNetNumQueuesParam(std::num::ParseIntError), - /// Failed parsing vhost-user-net queue size parameter. - ParseVuNetQueueSizeParam(std::num::ParseIntError), + /// Failed parsing vhost-user sock parameter. + ParseVuSockParam, + /// Failed parsing vhost-user queue number parameter. + ParseVuNumQueuesParam(std::num::ParseIntError), + /// Failed parsing vhost-user queue size parameter. + ParseVuQueueSizeParam(std::num::ParseIntError), /// Failed parsing vhost-user-net server parameter. ParseVuNetServerParam(std::num::ParseIntError), /// Failed parsing vsock context ID parameter. @@ -495,17 +495,17 @@ impl<'a> VhostUserNetConfig<'a> { mac = MacAddr::parse_str(mac_str).map_err(Error::ParseVuNetMacParam)?; } if sock.is_empty() { - return Err(Error::ParseVuNetSockParam); + return Err(Error::ParseVuSockParam); } if !num_queues_str.is_empty() { num_queues = num_queues_str .parse() - .map_err(Error::ParseVuNetNumQueuesParam)?; + .map_err(Error::ParseVuNumQueuesParam)?; } if !queue_size_str.is_empty() { queue_size = queue_size_str .parse() - .map_err(Error::ParseVuNetQueueSizeParam)?; + .map_err(Error::ParseVuQueueSizeParam)?; } let vu_cfg = VhostUserConfig {