From nobody Tue Dec 16 00:00:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1527175352919620.4753848443619; Thu, 24 May 2018 08:22:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3DAE06CFB7; Thu, 24 May 2018 15:22:31 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DE70D9CDC; Thu, 24 May 2018 15:22:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 6991C18033ED; Thu, 24 May 2018 15:22:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w4OFMOsi025494 for ; Thu, 24 May 2018 11:22:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 126D01117630; Thu, 24 May 2018 15:22:24 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E972111762D; Thu, 24 May 2018 15:22:23 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 24 May 2018 17:22:03 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Cc: Peter Krempa Subject: [libvirt] [PATCH 1/5] qemu: domain: Extract disk post parse code into a function X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 24 May 2018 15:22:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Later on, more stuff will be added so prevent the main function growing out of control. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_domain.c | 77 ++++++++++++++++++++++++++++------------------= ---- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ee676a2789..ab0a823f1e 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5687,6 +5687,46 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, return 0; } + +static int +qemuDomainDeviceDiskDefPostParse(virDomainDiskDefPtr disk, + virQEMUDriverConfigPtr cfg) +{ + /* set default disk types and drivers */ + /* assign default storage format and driver according to config */ + if (cfg->allowDiskFormatProbing) { + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) =3D=3D VIR_STORAGE_FILE_NONE && + (virDomainDiskGetType(disk) =3D=3D VIR_STORAGE_TYPE_FILE || + virDomainDiskGetType(disk) =3D=3D VIR_STORAGE_TYPE_BLOCK)) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_AUTO); + + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format =3D=3D VIR_STORAGE_FILE_NONE) + disk->mirror->format =3D VIR_STORAGE_FILE_AUTO; + } else { + /* default driver if probing is forbidden */ + if (!virDomainDiskGetDriver(disk) && + virDomainDiskSetDriver(disk, "qemu") < 0) + return -1; + + /* default disk format for drives */ + if (virDomainDiskGetFormat(disk) =3D=3D VIR_STORAGE_FILE_NONE && + (virDomainDiskGetType(disk) =3D=3D VIR_STORAGE_TYPE_FILE || + virDomainDiskGetType(disk) =3D=3D VIR_STORAGE_TYPE_BLOCK)) + virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); + + /* default disk format for mirrored drive */ + if (disk->mirror && + disk->mirror->format =3D=3D VIR_STORAGE_FILE_NONE) + disk->mirror->format =3D VIR_STORAGE_FILE_RAW; + } + + return 0; +} + + static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5711,40 +5751,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr d= ev, goto cleanup; } - /* set default disk types and drivers */ - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_DISK) { - virDomainDiskDefPtr disk =3D dev->data.disk; - - /* assign default storage format and driver according to config */ - if (cfg->allowDiskFormatProbing) { - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) =3D=3D VIR_STORAGE_FILE_NONE = && - (virDomainDiskGetType(disk) =3D=3D VIR_STORAGE_TYPE_FILE || - virDomainDiskGetType(disk) =3D=3D VIR_STORAGE_TYPE_BLOCK)) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_AUTO); - - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format =3D=3D VIR_STORAGE_FILE_NONE) - disk->mirror->format =3D VIR_STORAGE_FILE_AUTO; - } else { - /* default driver if probing is forbidden */ - if (!virDomainDiskGetDriver(disk) && - virDomainDiskSetDriver(disk, "qemu") < 0) - goto cleanup; - - /* default disk format for drives */ - if (virDomainDiskGetFormat(disk) =3D=3D VIR_STORAGE_FILE_NONE = && - (virDomainDiskGetType(disk) =3D=3D VIR_STORAGE_TYPE_FILE || - virDomainDiskGetType(disk) =3D=3D VIR_STORAGE_TYPE_BLOCK)) - virDomainDiskSetFormat(disk, VIR_STORAGE_FILE_RAW); - - /* default disk format for mirrored drive */ - if (disk->mirror && - disk->mirror->format =3D=3D VIR_STORAGE_FILE_NONE) - disk->mirror->format =3D VIR_STORAGE_FILE_RAW; - } - } + if (dev->type =3D=3D VIR_DOMAIN_DEVICE_DISK && + qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0) + goto cleanup; if (dev->type =3D=3D VIR_DOMAIN_DEVICE_VIDEO) { if (dev->data.video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list