From nobody Mon Feb 9 00:31:10 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) client-ip=216.205.24.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1585066549; cv=none; d=zohomail.com; s=zohoarc; b=OdXhFtdcT0cBxrIGtposxy+bjPkajShfK6ib5hzmfXWlLtR5Auh/Tdx+I0kEzp9V6gBSnhHLfkIxK7zWeQexBAlrUYH0U51EJp3pWBox23HiaRlJ3cx5ciIOjrr0ftP2HcDbWOcuTdn+zX56tMXFeZsySywoU/3Ue3AzXn/bvSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585066549; h=Content-Type:Content-Transfer-Encoding:Cc: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=flUETnfisRBArCw6Pl8noe0fvDLP6ow89VhxKn+beMg=; b=cmn1/AA0Jkn4+XgGGJtuNGiN2a2Y7X6O7e2+wIGRA6liYo/PPeaFC10vIp8HufqjtyhiDJ6ay0deSXK7JRhR1xowgMIV79sSdK24G0Xi+D++mDX516mJyv7JPXgLUXmEoSvIRKNoTJj1ykLecTl8zIAgk3GUqbsJIKm9H8LrnXI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [216.205.24.74]) by mx.zohomail.com with SMTPS id 1585066549344717.9144984409435; Tue, 24 Mar 2020 09:15:49 -0700 (PDT) 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-195-V2Ft2lxxM_yHXACoVRb7KA-1; Tue, 24 Mar 2020 12:15:45 -0400 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 9284318C35A3; Tue, 24 Mar 2020 16:15:37 +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 4FA695D9C5; Tue, 24 Mar 2020 16:15:37 +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 D827818089D6; Tue, 24 Mar 2020 16:15:36 +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 02OGFTba029545 for ; Tue, 24 Mar 2020 12:15:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 75B8F10EE780; Tue, 24 Mar 2020 16:15:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6E9101004C65 for ; Tue, 24 Mar 2020 16:15:25 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id CE77A8007B3 for ; Tue, 24 Mar 2020 16:15:25 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-477-IiW-NHWBPRepi63vmGSmAA-1; Tue, 24 Mar 2020 12:15:18 -0400 Received: by mail-wm1-f66.google.com with SMTP id l20so4176842wmi.3 for ; Tue, 24 Mar 2020 09:15:18 -0700 (PDT) Received: from localhost.localdomain (public-gprs375156.centertel.pl. [37.47.96.181]) by smtp.gmail.com with ESMTPSA id r17sm762028wrx.46.2020.03.24.09.15.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 09:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585066548; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=flUETnfisRBArCw6Pl8noe0fvDLP6ow89VhxKn+beMg=; b=UCaFiN23E+hk6DPvmTX2WO261QaDy+OyXaILyWh/RHFwqlrl6RGAw+Lttf0jr3uNhJOeAT O8BjWoMCXKAgYIyCH8547c9dz2R3WiB7zt2mj6sWt7kwXTfTTaZ2Q/REbB9teUDXSduMjj FlDL7/8LNzg+G31a/ZM/lKXkTcs51U0= X-MC-Unique: V2Ft2lxxM_yHXACoVRb7KA-1 X-MC-Unique: IiW-NHWBPRepi63vmGSmAA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=i/NMtwVX52BMVQNzJ0U7TFcQwYHqduBuwZuVu8GtHYs=; b=F65ilHsAXmJTIyOjr10fRm0IQvz4X6s+YFtfMy+8JEfHpGn6J7ImlCVm5cXwx03hdB WiBWR3/ZbhwOR+8etDbWy2rdIGLfh1khG4duR5ZiBrVSh03OTC4a5qOw6ZL3TthhFpBs TJiPjbqlogl2c1GOpnPnAs3kVdY9baos1Jn6p9TBr/u4jO6jT71OPsQV+QaUY6O68IAh L4PIvBHR8N+D2YMirAzG3NzXB2VJO7Lzx3df2jllbv73rdvXj+0D3I9MerEGDHDObRD4 SjFhI6l74T2AyYVq0lmFTqLpFggWKH8AbeRZ+kkYHrXa2sjA0KSfzjHZK2d9Qes/qbb8 aV4Q== X-Gm-Message-State: ANhLgQ0rq1afk9gnoanpg0pkR567xvLpYdKbwS58/GapwH2E2ZlMYj7T OpC1JtKYYQfpi1Mej9dHLF2crKDcluc= X-Google-Smtp-Source: ADFU+vvdC/KUmfggPoU5NeIRzANMruUwdd/R+XUjCTr0x3Uo1/QT7+44Dqk7OtvvaqSRJzdOlznsQA== X-Received: by 2002:a05:600c:24d2:: with SMTP id 18mr6269235wmu.38.1585066515413; Tue, 24 Mar 2020 09:15:15 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 3/7] vz: openvz: move video default logic to driver Date: Tue, 24 Mar 2020 17:14:32 +0100 Message-Id: <20200324161436.2138755-4-r4f4rfs@gmail.com> In-Reply-To: <20200324161436.2138755-1-r4f4rfs@gmail.com> References: <20200324161436.2138755-1-r4f4rfs@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02OGFTba029545 X-loop: libvir-list@redhat.com Cc: Rafael Fonseca 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 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" The logic setting a device default should be in the post parse function of individual driver code. Signed-off-by: Rafael Fonseca --- src/conf/domain_conf.c | 4 ---- src/openvz/openvz_conf.c | 8 ++++++++ src/vz/vz_driver.c | 8 ++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 04636e8694..e6a3500b7a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15732,10 +15732,6 @@ virDomainVideoDefaultType(const virDomainDef *def) =20 case VIR_DOMAIN_VIRT_VZ: case VIR_DOMAIN_VIRT_PARALLELS: - if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) - return VIR_DOMAIN_VIDEO_TYPE_VGA; - else - return VIR_DOMAIN_VIDEO_TYPE_PARALLELS; case VIR_DOMAIN_VIRT_XEN: case VIR_DOMAIN_VIRT_BHYVE: case VIR_DOMAIN_VIRT_QEMU: diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 1d60afae93..78547b8b28 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -1117,6 +1117,14 @@ openvzDomainDeviceDefPostParse(virDomainDeviceDefPtr= dev, return -1; } =20 + if (dev->type =3D=3D VIR_DOMAIN_DEVICE_VIDEO && + dev->data.video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { + if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) + dev->data.video->type =3D VIR_DOMAIN_VIDEO_TYPE_VGA; + else + dev->data.video->type =3D VIR_DOMAIN_VIDEO_TYPE_PARALLELS; + } + return 0; } =20 diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 6605247dd9..d882b91def 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -281,6 +281,14 @@ vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) dev->data.net->model =3D VIR_DOMAIN_NET_MODEL_E1000; =20 + if (dev->type =3D=3D VIR_DOMAIN_DEVICE_VIDEO && + dev->data.video->type =3D=3D VIR_DOMAIN_VIDEO_TYPE_DEFAULT) { + if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_HVM) + dev->data.video->type =3D VIR_DOMAIN_VIDEO_TYPE_VGA; + else + dev->data.video->type =3D VIR_DOMAIN_VIDEO_TYPE_PARALLELS; + } + return 0; } =20 --=20 2.25.1