From nobody Mon Apr 29 01:15:58 2024 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 From nobody Mon Apr 29 01:15:58 2024 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 1527175366168821.6034995652544; Thu, 24 May 2018 08:22:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9C79030A994A; Thu, 24 May 2018 15:22:41 +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 02925280AC; Thu, 24 May 2018 15:22:40 +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 8A76418033F1; Thu, 24 May 2018 15:22:40 +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 w4OFMOe5025500 for ; Thu, 24 May 2018 11:22:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id C5F9B1117651; 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 4CEB5111762D; Thu, 24 May 2018 15:22:24 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 24 May 2018 17:22:04 +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 2/5] qemu: domain: Extract network device def post parse code 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Thu, 24 May 2018 15:22:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_domain.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ab0a823f1e..dbdd94de2f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5727,6 +5727,22 @@ qemuDomainDeviceDiskDefPostParse(virDomainDiskDefPtr= disk, } +static int +qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net, + const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + if (net->type !=3D 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 d= ev, int ret =3D -1; if (dev->type =3D=3D VIR_DOMAIN_DEVICE_NET && - dev->data.net->type !=3D 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 =3D=3D VIR_DOMAIN_DEVICE_DISK && qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0) --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 01:15:58 2024 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 1527175369274187.1673629958333; Thu, 24 May 2018 08:22:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 93E9660AA3; Thu, 24 May 2018 15:22:47 +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 5646E308BDA1; Thu, 24 May 2018 15:22:47 +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 F39F018033F0; Thu, 24 May 2018 15:22:46 +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 w4OFMPau025508 for ; Thu, 24 May 2018 11:22:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 838B01117630; Thu, 24 May 2018 15:22:25 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0B8E1111762D; Thu, 24 May 2018 15:22:24 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 24 May 2018 17:22:05 +0200 Message-Id: <9a0824f3a0782942525aea1e4f2331508a5e81f0.1527175274.git.pkrempa@redhat.com> 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 3/5] qemu: domain: Extract video device def post parse code 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 24 May 2018 15:22:48 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_domain.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index dbdd94de2f..e9a8b0c332 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5743,6 +5743,28 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr n= et, } +static int +qemuDomainDeviceVideoDefPostParse(virDomainVideoDefPtr video, + const virDomainDef *def) +{ + if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { + if (ARCH_IS_PPC64(def->os.arch)) + video->type =3D VIR_DOMAIN_VIDEO_TYPE_VGA; + else if (qemuDomainIsVirt(def) || ARCH_IS_S390(def->os.arch)) + video->type =3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO; + else + video->type =3D VIR_DOMAIN_VIDEO_TYPE_CIRRUS; + } + + if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_QXL && + !video->vgamem) { + video->vgamem =3D QEMU_QXL_VGAMEM_DEFAULT; + } + + return 0; +} + + static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5767,21 +5789,9 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr d= ev, 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) { - if (ARCH_IS_PPC64(def->os.arch)) - dev->data.video->type =3D VIR_DOMAIN_VIDEO_TYPE_VGA; - else if (qemuDomainIsVirt(def) || ARCH_IS_S390(def->os.arch)) - dev->data.video->type =3D VIR_DOMAIN_VIDEO_TYPE_VIRTIO; - else - dev->data.video->type =3D VIR_DOMAIN_VIDEO_TYPE_CIRRUS; - } - - if (dev->data.video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_QXL && - !dev->data.video->vgamem) { - dev->data.video->vgamem =3D QEMU_QXL_VGAMEM_DEFAULT; - } - } + if (dev->type =3D=3D VIR_DOMAIN_DEVICE_VIDEO && + qemuDomainDeviceVideoDefPostParse(dev->data.video, def) < 0) + goto cleanup; if (dev->type =3D=3D VIR_DOMAIN_DEVICE_PANIC && dev->data.panic->model =3D=3D VIR_DOMAIN_PANIC_MODEL_DEFAULT) { --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 01:15:58 2024 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 152717535270840.08186248267225; Thu, 24 May 2018 08:22:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50698C9DA0; Thu, 24 May 2018 15:22:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 00A4A308BDA3; Thu, 24 May 2018 15:22:29 +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 A10B44A469; Thu, 24 May 2018 15:22:28 +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 w4OFMQZr025515 for ; Thu, 24 May 2018 11:22:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 42E4D1117651; Thu, 24 May 2018 15:22:26 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id BDEE3111762D; Thu, 24 May 2018 15:22:25 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 24 May 2018 17:22:06 +0200 Message-Id: <76d83d1634ec56ef7512396f73d60fe759080b87.1527175274.git.pkrempa@redhat.com> 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 4/5] qemu: domain: Extract panic device def post parse code 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.84 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 24 May 2018 15:22:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_domain.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e9a8b0c332..a6b879aa76 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5765,6 +5765,23 @@ qemuDomainDeviceVideoDefPostParse(virDomainVideoDefP= tr video, } +static int +qemuDomainDevicePanicDefPostParse(virDomainPanicDefPtr panic, + const virDomainDef *def) +{ + if (panic->model =3D=3D VIR_DOMAIN_PANIC_MODEL_DEFAULT) { + if (qemuDomainIsPSeries(def)) + panic->model =3D VIR_DOMAIN_PANIC_MODEL_PSERIES; + else if (ARCH_IS_S390(def->os.arch)) + panic->model =3D VIR_DOMAIN_PANIC_MODEL_S390; + else + panic->model =3D VIR_DOMAIN_PANIC_MODEL_ISA; + } + + return 0; +} + + static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, @@ -5794,14 +5811,8 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr d= ev, goto cleanup; if (dev->type =3D=3D VIR_DOMAIN_DEVICE_PANIC && - dev->data.panic->model =3D=3D VIR_DOMAIN_PANIC_MODEL_DEFAULT) { - if (qemuDomainIsPSeries(def)) - dev->data.panic->model =3D VIR_DOMAIN_PANIC_MODEL_PSERIES; - else if (ARCH_IS_S390(def->os.arch)) - dev->data.panic->model =3D VIR_DOMAIN_PANIC_MODEL_S390; - else - dev->data.panic->model =3D VIR_DOMAIN_PANIC_MODEL_ISA; - } + qemuDomainDevicePanicDefPostParse(dev->data.panic, def) < 0) + goto cleanup; if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CONTROLLER && qemuDomainControllerDefPostParse(dev->data.controller, def, --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Mon Apr 29 01:15:58 2024 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 1527175366261764.3601237100708; Thu, 24 May 2018 08:22:46 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4F3CA29203; Thu, 24 May 2018 15:22:41 +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 ED33F5DDFE; Thu, 24 May 2018 15:22:40 +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 88E7918033C1; Thu, 24 May 2018 15:22:40 +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 w4OFMR7c025521 for ; Thu, 24 May 2018 11:22:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 00F331117630; Thu, 24 May 2018 15:22:27 +0000 (UTC) Received: from angien.brq.redhat.com (unknown [10.43.2.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CC8F111762D; Thu, 24 May 2018 15:22:26 +0000 (UTC) From: Peter Krempa To: libvir-list@redhat.com Date: Thu, 24 May 2018 17:22:07 +0200 Message-Id: <24b93c66c3b10cacbc7ef60f14aacaf99262b8bf.1527175274.git.pkrempa@redhat.com> 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 5/5] qemu: domain: Use typecasted enum in qemuDomainDeviceDefPostParse 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 24 May 2018 15:22:42 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Rather than a lot of checks use a switch statement. This optimizes the code as if one device is matched the rest will certainly not match. Signed-off-by: Peter Krempa Reviewed-by: J=EF=BF=BDn Tomko --- src/qemu/qemu_domain.c | 77 ++++++++++++++++++++++++++++++++++------------= ---- 1 file changed, 52 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index a6b879aa76..47910acb83 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5798,39 +5798,66 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr = dev, virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver); int ret =3D -1; - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_NET && - qemuDomainDeviceNetDefPostParse(dev->data.net, def, qemuCaps) < 0) - goto cleanup; + switch ((virDomainDeviceType) dev->type) { + case VIR_DOMAIN_DEVICE_NET: + ret =3D qemuDomainDeviceNetDefPostParse(dev->data.net, def, qemuCa= ps); + break; - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_DISK && - qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_DISK: + ret =3D qemuDomainDeviceDiskDefPostParse(dev->data.disk, cfg); + break; - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_VIDEO && - qemuDomainDeviceVideoDefPostParse(dev->data.video, def) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_VIDEO: + ret =3D qemuDomainDeviceVideoDefPostParse(dev->data.video, def); + break; - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_PANIC && - qemuDomainDevicePanicDefPostParse(dev->data.panic, def) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_PANIC: + ret =3D qemuDomainDevicePanicDefPostParse(dev->data.panic, def); + break; - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CONTROLLER && - qemuDomainControllerDefPostParse(dev->data.controller, def, - qemuCaps, parseFlags) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_CONTROLLER: + ret =3D qemuDomainControllerDefPostParse(dev->data.controller, def, + qemuCaps, parseFlags); + break; - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_SHMEM && - qemuDomainShmemDefPostParse(dev->data.shmem) < 0) - goto cleanup; + case VIR_DOMAIN_DEVICE_SHMEM: + ret =3D qemuDomainShmemDefPostParse(dev->data.shmem); + break; - if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CHR && - qemuDomainChrDefPostParse(dev->data.chr, def, driver, parseFlags) = < 0) { - goto cleanup; - } + case VIR_DOMAIN_DEVICE_CHR: + ret =3D qemuDomainChrDefPostParse(dev->data.chr, def, driver, pars= eFlags); + break; - ret =3D 0; + case VIR_DOMAIN_DEVICE_LEASE: + case VIR_DOMAIN_DEVICE_FS: + case VIR_DOMAIN_DEVICE_INPUT: + case VIR_DOMAIN_DEVICE_SOUND: + case VIR_DOMAIN_DEVICE_HOSTDEV: + case VIR_DOMAIN_DEVICE_WATCHDOG: + case VIR_DOMAIN_DEVICE_GRAPHICS: + case VIR_DOMAIN_DEVICE_HUB: + case VIR_DOMAIN_DEVICE_REDIRDEV: + case VIR_DOMAIN_DEVICE_SMARTCARD: + case VIR_DOMAIN_DEVICE_MEMBALLOON: + case VIR_DOMAIN_DEVICE_NVRAM: + case VIR_DOMAIN_DEVICE_RNG: + case VIR_DOMAIN_DEVICE_TPM: + case VIR_DOMAIN_DEVICE_MEMORY: + case VIR_DOMAIN_DEVICE_IOMMU: + ret =3D 0; + break; + + case VIR_DOMAIN_DEVICE_NONE: + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("unexpected VIR_DOMAIN_DEVICE_NONE")); + break; + + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportEnumRangeError(virDomainDeviceType, dev->type); + break; + } - cleanup: virObjectUnref(cfg); return ret; } --=20 2.16.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list