qemu: domain: Extract disk post parse code into a function

Later on, more stuff will be added so prevent the main function growing
out of control.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>

src/qemu/qemu_domain.c

@@ -5687,34 +5687,12 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr,
     return 0;
 }
 
+
 static int
-qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
-                             const virDomainDef *def,
-                             virCapsPtr caps ATTRIBUTE_UNUSED,
-                             unsigned int parseFlags,
-                             void *opaque,
-                             void *parseOpaque)
+qemuDomainDeviceDiskDefPostParse(virDomainDiskDefPtr disk,
+                                 virQEMUDriverConfigPtr cfg)
 {
-    virQEMUDriverPtr driver = opaque;
-    /* Note that qemuCaps may be NULL when this function is called. This
-     * function shall not fail in that case. It will be re-run on VM startup
-     * with the capabilities populated. */
-    virQEMUCapsPtr qemuCaps = parseOpaque;
-    virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-    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;
-    }
-
     /* set default disk types and drivers */
-    if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
-        virDomainDiskDefPtr disk = dev->data.disk;
-
     /* assign default storage format and driver according to config */
     if (cfg->allowDiskFormatProbing) {
         /* default disk format for drives */
@@ -5731,7 +5709,7 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
         /* default driver if probing is forbidden */
         if (!virDomainDiskGetDriver(disk) &&
             virDomainDiskSetDriver(disk, "qemu") < 0)
-                goto cleanup;
+            return -1;
 
         /* default disk format for drives */
         if (virDomainDiskGetFormat(disk) == VIR_STORAGE_FILE_NONE &&
@@ -5744,8 +5722,39 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
             disk->mirror->format == VIR_STORAGE_FILE_NONE)
             disk->mirror->format = VIR_STORAGE_FILE_RAW;
     }
+
+    return 0;
+}
+
+
+static int
+qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
+                             const virDomainDef *def,
+                             virCapsPtr caps ATTRIBUTE_UNUSED,
+                             unsigned int parseFlags,
+                             void *opaque,
+                             void *parseOpaque)
+{
+    virQEMUDriverPtr driver = opaque;
+    /* Note that qemuCaps may be NULL when this function is called. This
+     * function shall not fail in that case. It will be re-run on VM startup
+     * with the capabilities populated. */
+    virQEMUCapsPtr qemuCaps = parseOpaque;
+    virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
+    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;
     }
 
+    if (dev->type == VIR_DOMAIN_DEVICE_DISK &&
+        qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0)
+        goto cleanup;
+
     if (dev->type == VIR_DOMAIN_DEVICE_VIDEO) {
         if (dev->data.video->type == VIR_DOMAIN_VIDEO_TYPE_DEFAULT) {
             if (ARCH_IS_PPC64(def->os.arch))