From nobody Thu May 15 07:08:41 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 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