From nobody Mon Feb 9 05:19:54 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1605612539; cv=none; d=zohomail.com; s=zohoarc; b=NdX1rvqA6Qey/OXG9w57S6bvrOraH5luBoracU7bTW066x5uxWvgfLahrM3U7Yr+tyTevXLI/iJzYqr4m5oRAb1aJ2vyd5tV+ud5mfStCglVp7c5ipoNVSGu6zxf29VutJ1m4imSVaeBcn9Oml/qY/sNtLNjN2p6Pakaq5CkrkE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605612539; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CDqMkjbijwmLftVYXDdEfr6QTi1y7cH/aRdGPyCd/qI=; b=gLZy9vKmryMks5ZjY+Pc2adi5tApTNjG2qEQo5Q8RdvsyOfSxORwUUNt1QCb9PGmHR0ETwm9tnUtDplvyL05FJIWu0H/kgxc8nS7GLEFw1xzucuwE9tXcr3sPyZlEUcIEQGD88Es9H4Ck2zPz0JlGizpDbqzibv9LqCi+HW6l9M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605612539617121.55109530950983; Tue, 17 Nov 2020 03:28:59 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-VrXeWCxyMrugBrBCO-lrOw-1; Tue, 17 Nov 2020 06:28:54 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id D31081007B04; Tue, 17 Nov 2020 11:28:48 +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 B25245D9D2; Tue, 17 Nov 2020 11:28:48 +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 7BD81180B791; Tue, 17 Nov 2020 11:28:48 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AHBSZgT027252 for ; Tue, 17 Nov 2020 06:28:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 66A6F5D9D2; Tue, 17 Nov 2020 11:28:35 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.192.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id D839F5D9CC for ; Tue, 17 Nov 2020 11:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605612536; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CDqMkjbijwmLftVYXDdEfr6QTi1y7cH/aRdGPyCd/qI=; b=WsieififInHXXWCQmJfqVIlf/FgPjtZJYQSCzT6fWz7fUKcMmTULud9neI5UQDODF392BR N9UaFa9PiXlHrfPFJda07/13M0cWan3Jo+fCqwn9LVDM4yAkjN2JSlwgb+8YOZvLa1GHb9 tAdNvrSNq/qwrqKVYkCvSRs4I7KthCQ= X-MC-Unique: VrXeWCxyMrugBrBCO-lrOw-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH 2/5] qemu_validate: Deduplicate code for video model check Date: Tue, 17 Nov 2020 12:28:24 +0100 Message-Id: <9d2fc699752606666902a1438a02e7fe69ae615f.1605611915.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In my recent commit of a33279daa8 I've moved video model check from domain capabilities validator into qemu validator. During that I had to basically duplicate video model to qemuCaps checks. Problem with this approach is that after my commit qemu validator and domCaps are disconnected and thus domCaps might report (in general) different set of supported video models. Signed-off-by: Michal Privoznik --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 4 ++++ src/qemu/qemu_validate.c | 37 +++--------------------------------- 3 files changed, 8 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9f9f976754..78d3b965c6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5991,7 +5991,7 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCapsPt= r qemuCaps, } =20 =20 -static void +void virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps, virDomainCapsDeviceVideoPtr dev) { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 9d3f73b2ab..22b3da3e63 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -739,6 +739,10 @@ int virQEMUCapsFillDomainCaps(virQEMUCapsPtr qemuCaps, virFirmwarePtr *firmwares, size_t nfirmwares); =20 +void virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps, + virDomainCapsDeviceVideoPtr dev); + + bool virQEMUCapsGuestIsNative(virArch host, virArch guest); =20 diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 09cdcb20c2..6e1db2715d 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2203,46 +2203,15 @@ static int qemuValidateDomainDeviceDefVideo(const virDomainVideoDef *video, virQEMUCapsPtr qemuCaps) { - virQEMUCapsFlags cap =3D QEMU_CAPS_LAST; + virDomainCapsDeviceVideo videoCaps =3D { 0 }; =20 /* there's no properties to validate for NONE video devices */ if (video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_NONE) return 0; =20 - switch ((virDomainVideoType) video->type) { - case VIR_DOMAIN_VIDEO_TYPE_VGA: - cap =3D QEMU_CAPS_DEVICE_VGA; - break; - case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: - cap =3D QEMU_CAPS_DEVICE_CIRRUS_VGA; - break; - case VIR_DOMAIN_VIDEO_TYPE_VMVGA: - cap =3D QEMU_CAPS_DEVICE_VMWARE_SVGA; - break; - case VIR_DOMAIN_VIDEO_TYPE_QXL: - cap =3D QEMU_CAPS_DEVICE_QXL; - break; - case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: - cap =3D QEMU_CAPS_DEVICE_VIRTIO_GPU; - break; - case VIR_DOMAIN_VIDEO_TYPE_BOCHS: - cap =3D QEMU_CAPS_DEVICE_BOCHS_DISPLAY; - break; - case VIR_DOMAIN_VIDEO_TYPE_RAMFB: - cap =3D QEMU_CAPS_DEVICE_RAMFB; - break; - case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: - case VIR_DOMAIN_VIDEO_TYPE_XEN: - case VIR_DOMAIN_VIDEO_TYPE_VBOX: - case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: - case VIR_DOMAIN_VIDEO_TYPE_GOP: - case VIR_DOMAIN_VIDEO_TYPE_NONE: - case VIR_DOMAIN_VIDEO_TYPE_LAST: - /* nada */ - break; - } + virQEMUCapsFillDomainDeviceVideoCaps(qemuCaps, &videoCaps); =20 - if (!virQEMUCapsGet(qemuCaps, cap)) { + if (!VIR_DOMAIN_CAPS_ENUM_IS_SET(videoCaps.modelType, video->type)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("domain configuration does not support video mode= l '%s'"), virDomainVideoTypeToString(video->type)); --=20 2.26.2