From nobody Mon Feb 9 02:13:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1585066538; cv=none; d=zohomail.com; s=zohoarc; b=Ea7RKZU/H4gD90egz16FjcRPqYl8wmADOyF3klxHuSAWF0bmtHwUQ2KIkM3WQfzkWVz6Rg5KLkYEmqbXYxpcxkvdn0/GYLjFBMOF7OSXaXuoCIfJ4g1oF5rbYzAoNoDqDN11HJZ3A+2HwAX2EZ/kO92Knw+N2kxCqaeDEmrzmbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585066538; 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=321dvr0pUJ3DY4jKESTvejN+lVRYYhZG15mQbTTk0Rk=; b=oCqpvvbs899klHKqWLaG22mhU690W9VHYQa/EHr/ffGDaZ7g56ac1C0LMs+rq1+mdgYoGD1ZyY5ojCwcRiK6XHQhI/l9M7i91YWsGPTS0kSEtP9jI81PQACfiyghexecNV+OkXcUksA1HVuFpGKlv0PeH2RgUxJylF1Gc5rPA7E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.74]) by mx.zohomail.com with SMTPS id 1585066538126227.22181150783126; Tue, 24 Mar 2020 09:15:38 -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-366-Gx2ii6BKN0KOWkV_jJIBKQ-1; Tue, 24 Mar 2020 12:15:34 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id AC8C21005513; Tue, 24 Mar 2020 16:15:27 +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 7977CA0A67; Tue, 24 Mar 2020 16:15:27 +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 1B29518089C8; Tue, 24 Mar 2020 16:15:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02OGFPnn029509 for ; Tue, 24 Mar 2020 12:15:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id D05A52166B2B; Tue, 24 Mar 2020 16:15:25 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CBD032166B2A for ; Tue, 24 Mar 2020 16:15:25 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (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 A95DC8FF668 for ; Tue, 24 Mar 2020 16:15:25 +0000 (UTC) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-231-7D2N6lm2MoabmL914wrF5Q-1; Tue, 24 Mar 2020 12:15:23 -0400 Received: by mail-wr1-f66.google.com with SMTP id p10so9808034wrt.6 for ; Tue, 24 Mar 2020 09:15:22 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Mar 2020 09:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585066536; 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=321dvr0pUJ3DY4jKESTvejN+lVRYYhZG15mQbTTk0Rk=; b=NkhU+DV8ALLfyh55tvmxUkOHR2yKRI/xvh4H7jgmJ1EUJxWKj4U0ERKoDwXxKG7H+DC+vv mJj/JFzZQOETomp2bDxowcH+mYVC8XaEjRC+BaIQli6NPh/JxSdYFhyM1UQhmddmbVfjKx y9XDs2AGz8tx3vYGV8oC79KxOv31h5s= X-MC-Unique: Gx2ii6BKN0KOWkV_jJIBKQ-1 X-MC-Unique: 7D2N6lm2MoabmL914wrF5Q-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=vF4EPGDURq41mSGMiRVG0Qy463zOycXyL7T07Hd3Phk=; b=RxdtujWPCiHIkBFCRUL83pouPADoG4YY7rd5kuhkR+5EhCWMfxgh+T3TDpmteR9nK2 icCx5h+969nRE3AXhgxWiJVVUjrEtFexEe/8nMGlhMvaU09rBGf5Flj9rlVRZBC9xpgp Yu6fRT8YA1Ct2SfP3vDB+prUFsiyH3mpAvukCFc17DaN/EhmpCg8vLrjYNqaGWetNA8X ih7RPy0ta3/A7gqzX87MXXN8s8nbmUTv4fGy1rXUsAIkbGej458mPwWveU9iDcRA7XR9 MhzNv0L73SvNTWbCbxjY+YvDu76AMyOI+kbhTnxT9C7WmPL79jvghv2bWEtFWh2JiYv7 wfYQ== X-Gm-Message-State: ANhLgQ0xgiCtW7VPq5sh1rfCWf/OZ5Yb1ItE2o1EVe5vdchx9PwM/L37 XYYYMvBPbXwVnFXRYYa4YTaeR9/qDuw= X-Google-Smtp-Source: ADFU+vsCSAFkIM01DTCwkczH9OumBy2ahA25XhiaylLlfrEUzMr/x3SPaER9m/FDfbhRVwuiS7z6dQ== X-Received: by 2002:a5d:5451:: with SMTP id w17mr37674737wrv.142.1585066521622; Tue, 24 Mar 2020 09:15:21 -0700 (PDT) From: Rafael Fonseca To: libvir-list@redhat.com Subject: [PATCH 7/7] conf: domain_conf: remove virDomainVideoDefaultType Date: Tue, 24 Mar 2020 17:14:36 +0100 Message-Id: <20200324161436.2138755-8-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.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02OGFPnn029509 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.11 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 has been moved to the individual drivers. Signed-off-by: Rafael Fonseca --- src/conf/domain_conf.c | 35 ++++------------------------------- src/conf/domain_conf.h | 1 - src/libvirt_private.syms | 1 - 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 665bb10b27..27bc5a797b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15711,32 +15711,6 @@ virDomainVideoDefaultRAM(const virDomainDef *def, } =20 =20 -int -virDomainVideoDefaultType(const virDomainDef *def) -{ - switch ((virDomainVirtType)def->virtType) { - case VIR_DOMAIN_VIRT_VBOX: - case VIR_DOMAIN_VIRT_TEST: - case VIR_DOMAIN_VIRT_VMWARE: - case VIR_DOMAIN_VIRT_VZ: - case VIR_DOMAIN_VIRT_PARALLELS: - case VIR_DOMAIN_VIRT_XEN: - case VIR_DOMAIN_VIRT_BHYVE: - case VIR_DOMAIN_VIRT_QEMU: - case VIR_DOMAIN_VIRT_KQEMU: - case VIR_DOMAIN_VIRT_KVM: - case VIR_DOMAIN_VIRT_LXC: - case VIR_DOMAIN_VIRT_UML: - case VIR_DOMAIN_VIRT_OPENVZ: - case VIR_DOMAIN_VIRT_HYPERV: - case VIR_DOMAIN_VIRT_PHYP: - case VIR_DOMAIN_VIRT_NONE: - case VIR_DOMAIN_VIRT_LAST: - default: - return VIR_DOMAIN_VIDEO_TYPE_DEFAULT; - } -} - static virDomainVideoAccelDefPtr virDomainVideoAccelDefParseXML(xmlNodePtr node) { @@ -15854,7 +15828,6 @@ static virDomainVideoDefPtr virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt, xmlNodePtr node, xmlXPathContextPtr ctxt, - const virDomainDef *dom, unsigned int flags) { virDomainVideoDefPtr def; @@ -15925,7 +15898,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xml= opt, goto error; } } else { - def->type =3D virDomainVideoDefaultType(dom); + def->type =3D VIR_DOMAIN_VIDEO_TYPE_DEFAULT; } =20 if (driver_name) { @@ -16871,7 +16844,7 @@ virDomainDeviceDefParse(const char *xmlStr, break; case VIR_DOMAIN_DEVICE_VIDEO: if (!(dev->data.video =3D virDomainVideoDefParseXML(xmlopt, node, - ctxt, def, flags= ))) + ctxt, flags))) return NULL; break; case VIR_DOMAIN_DEVICE_HOSTDEV: @@ -21633,7 +21606,7 @@ virDomainDefParseXML(xmlDocPtr xml, ssize_t insertAt =3D -1; =20 if (!(video =3D virDomainVideoDefParseXML(xmlopt, nodes[i], - ctxt, def, flags))) + ctxt, flags))) goto error; =20 if (video->primary) { @@ -24314,7 +24287,7 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def, v= irDomainXMLOptionPtr xmlopt) =20 if (!(video =3D virDomainVideoDefNew(xmlopt))) goto cleanup; - video->type =3D virDomainVideoDefaultType(def); + video->type =3D VIR_DOMAIN_VIDEO_TYPE_DEFAULT; if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0) goto cleanup; =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index b7c31eb62f..33875d942f 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -3364,7 +3364,6 @@ int virDomainFSInsert(virDomainDefPtr def, virDomainF= SDefPtr fs); int virDomainFSIndexByName(virDomainDefPtr def, const char *name); virDomainFSDefPtr virDomainFSRemove(virDomainDefPtr def, size_t i); =20 -int virDomainVideoDefaultType(const virDomainDef *def); unsigned int virDomainVideoDefaultRAM(const virDomainDef *def, const virDomainVideoType type); =20 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index c9f0da2bf9..3f032c7963 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -633,7 +633,6 @@ virDomainTPMModelTypeFromString; virDomainTPMModelTypeToString; virDomainUSBDeviceDefForeach; virDomainVideoDefaultRAM; -virDomainVideoDefaultType; virDomainVideoDefClear; virDomainVideoDefFree; virDomainVideoDefNew; --=20 2.25.1