[libvirt] [PATCH 6/7] conf: Introduce virDomainNetDefPostParse()
Minor tweaks to ensure compliance with our coding style.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
src/conf/domain_conf.c | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 872cb3352b..7f66fa27ff 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -4933,6 +4933,18 @@ virDomainControllerDefPostParse(virDomainControllerDefPtr cdev)
}
+static int
+virDomainNetDefPostParse(virDomainNetDefPtr net)
+{
+ if (!virDomainNetIsVirtioModel(net) &&
+ virDomainCheckVirtioOptions(net->virtio) < 0) {
+ return -1;
+ }
+
+ return 0;
+}
+
+
static int
virDomainVsockDefPostParse(virDomainVsockDefPtr vsock)
{
@@ -4973,12 +4985,8 @@ virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev,
if (dev->type == VIR_DOMAIN_DEVICE_CONTROLLER)
return virDomainControllerDefPostParse(dev->data.controller);
- if (dev->type == VIR_DOMAIN_DEVICE_NET) {
- virDomainNetDefPtr net = dev->data.net;
- if (!virDomainNetIsVirtioModel(net) &&
- virDomainCheckVirtioOptions(net->virtio) < 0)
- return -1;
- }
+ if (dev->type == VIR_DOMAIN_DEVICE_NET)
+ return virDomainNetDefPostParse(dev->data.net);
if (dev->type == VIR_DOMAIN_DEVICE_VSOCK &&
virDomainVsockDefPostParse(dev->data.vsock) < 0)
--
2.20.1