]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: domain: Extract network device def post parse code
authorPeter Krempa <pkrempa@redhat.com>
Thu, 24 May 2018 15:01:55 +0000 (17:01 +0200)
committerPeter Krempa <pkrempa@redhat.com>
Thu, 24 May 2018 16:25:30 +0000 (18:25 +0200)
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_domain.c

index ab0a823f1e6ab59010fa1095c4acd5e3b7d11fcf..dbdd94de2fdd4458590ab2eaa8318d1a2acb9119 100644 (file)
@@ -5727,6 +5727,22 @@ qemuDomainDeviceDiskDefPostParse(virDomainDiskDefPtr disk,
 }
 
 
+static int
+qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net,
+                                const virDomainDef *def,
+                                virQEMUCapsPtr qemuCaps)
+{
+    if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
+        !net->model) {
+        if (VIR_STRDUP(net->model,
+                       qemuDomainDefaultNetModel(def, qemuCaps)) < 0)
+            return -1;
+    }
+
+    return 0;
+}
+
+
 static int
 qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
                              const virDomainDef *def,
@@ -5744,12 +5760,8 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
     int ret = -1;
 
     if (dev->type == VIR_DOMAIN_DEVICE_NET &&
-        dev->data.net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
-        !dev->data.net->model) {
-        if (VIR_STRDUP(dev->data.net->model,
-                       qemuDomainDefaultNetModel(def, qemuCaps)) < 0)
-            goto cleanup;
-    }
+        qemuDomainDeviceNetDefPostParse(dev->data.net, def, qemuCaps) < 0)
+        goto cleanup;
 
     if (dev->type == VIR_DOMAIN_DEVICE_DISK &&
         qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0)