From nobody Mon Feb 9 12:15:27 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1616054539; cv=none; d=zohomail.com; s=zohoarc; b=Blw7JKlgyMgL7o7hVnO+udJ5RcbMq0HxMgwdxnaoqyq2I/VKneym9qgSt7lydzlJWZ6QzL7hKjKyDd8ZcK/QFVjq2yiSwbJpnby3qcGJksOiXGrdFVtoPebQ7ff4UZvR8abSGNp7Wg3k3QxUE7d6AuecElSNmZb21/uWdhT2mZQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054539; 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=GbgtHvrpZRspP0+uj22JYwgMlhGekJHlvRTYo2Hyf4c=; b=CjzckpBqItmnkodkDP4YN8SkZiGS5w2F0rLC6/J9JLKc8tbWMbJvd1pQrbLL+Gsw1vgP8cATmesnYhbo/nwWQzVgZaaZTBWotNMWNWceJcCbKMbgnGX0QfNzzlr6VQP9teThXpQy2HXrJny7g1T23OodZ+xA8+5loFw+FbseMdI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.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 [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616054539597533.635495703339; Thu, 18 Mar 2021 01:02:19 -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-460-Hfs0JcDtMDeYv0NQNtivbA-1; Thu, 18 Mar 2021 04:02:16 -0400 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B7F0190A7A1; Thu, 18 Mar 2021 08:02:11 +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 E81941F427; Thu, 18 Mar 2021 08:02:10 +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 9E99A4A71A; Thu, 18 Mar 2021 08:02:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12I81oUf028367 for ; Thu, 18 Mar 2021 04:01:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2E5C063634; Thu, 18 Mar 2021 08:01:50 +0000 (UTC) Received: from work.redhat.com (ovpn-112-180.ams2.redhat.com [10.36.112.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id 748586362B; Thu, 18 Mar 2021 08:01:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054538; 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=GbgtHvrpZRspP0+uj22JYwgMlhGekJHlvRTYo2Hyf4c=; b=InY4oYLM55LbrZusb0GrigwukQJlyjy3edy3Jjs1Bw2ZE23JJiImd+nepA6nkBpl+XU9G+ whp1+7xxssw1ybLPoC9WiN6KcyrHE75KkQjz5E5HlMxLMI6P6gCBgTDpr3azLXo9bM2QKG BKcHY8eTucEo494LNLMYGxD4DlY12fI= X-MC-Unique: Hfs0JcDtMDeYv0NQNtivbA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 18/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainGraphicsDefParseXMLSpice Date: Thu, 18 Mar 2021 09:00:57 +0100 Message-Id: <20210318080117.70255-19-twiederh@redhat.com> In-Reply-To: <20210318080117.70255-1-twiederh@redhat.com> References: <20210318080117.70255-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.84 on 10.5.11.23 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" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 66 +++++++++++------------------------------- 1 file changed, 17 insertions(+), 49 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 011745e73a..360528ef1e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13429,23 +13429,18 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphi= csDefPtr def, =20 def->data.spice.zlib =3D compressionVal; } else if (virXMLNodeNameEqual(cur, "playback")) { - int compressionVal; - g_autofree char *compression =3D virXMLPropString(cur, "co= mpression"); + virTristateSwitch compression =3D VIR_TRISTATE_SWITCH_ABSE= NT; =20 - if (!compression) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("spice playback missing compression")= ); + if (virXMLPropOnOff(cur, "compression", &compression) < 0) return -1; - } =20 - if ((compressionVal =3D - virTristateSwitchTypeFromString(compression)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unknown spice playback compression")= ); + if (compression =3D=3D VIR_TRISTATE_SWITCH_ABSENT) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("spice playback missing compression")= ); return -1; } =20 - def->data.spice.playback =3D compressionVal; + def->data.spice.playback =3D compression; } else if (virXMLNodeNameEqual(cur, "streaming")) { int modeVal; g_autofree char *mode =3D virXMLPropString(cur, "mode"); @@ -13464,62 +13459,35 @@ virDomainGraphicsDefParseXMLSpice(virDomainGraphi= csDefPtr def, =20 def->data.spice.streaming =3D modeVal; } else if (virXMLNodeNameEqual(cur, "clipboard")) { - int copypasteVal; - g_autofree char *copypaste =3D virXMLPropString(cur, "copy= paste"); + if (virXMLPropYesNo(cur, "copypaste", &def->data.spice.cop= ypaste) < 0) + return -1; =20 - if (!copypaste) { + if (def->data.spice.copypaste =3D=3D VIR_TRISTATE_BOOL_ABS= ENT) { virReportError(VIR_ERR_XML_ERROR, "%s", _("spice clipboard missing copypaste")); return -1; } - - if ((copypasteVal =3D - virTristateBoolTypeFromString(copypaste)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown copypaste value '%s'"), copy= paste); - return -1; - } - - def->data.spice.copypaste =3D copypasteVal; } else if (virXMLNodeNameEqual(cur, "filetransfer")) { - int enableVal; - g_autofree char *enable =3D virXMLPropString(cur, "enable"= ); + if (virXMLPropYesNo(cur, "enable", &def->data.spice.filetr= ansfer) < 0) + return -1; =20 - if (!enable) { + if (def->data.spice.filetransfer =3D=3D VIR_TRISTATE_BOOL_= ABSENT) { virReportError(VIR_ERR_XML_ERROR, "%s", _("spice filetransfer missing enable")); return -1; } + } else if (virXMLNodeNameEqual(cur, "gl")) { + def->data.spice.rendernode =3D virXMLPropString(cur, + "rendernode"= ); =20 - if ((enableVal =3D - virTristateBoolTypeFromString(enable)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown enable value '%s'"), enable); + if (virXMLPropYesNo(cur, "enable", &def->data.spice.gl) < = 0) return -1; - } - - def->data.spice.filetransfer =3D enableVal; - } else if (virXMLNodeNameEqual(cur, "gl")) { - int enableVal; - g_autofree char *enable =3D virXMLPropString(cur, "enable"= ); - g_autofree char *rendernode =3D virXMLPropString(cur, "ren= dernode"); =20 - if (!enable) { + if (def->data.spice.gl =3D=3D VIR_TRISTATE_BOOL_ABSENT) { virReportError(VIR_ERR_XML_ERROR, "%s", _("spice gl element missing enable")); return -1; } - - if ((enableVal =3D - virTristateBoolTypeFromString(enable)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown enable value '%s'"), enable); - return -1; - } - - def->data.spice.gl =3D enableVal; - def->data.spice.rendernode =3D g_steal_pointer(&rendernode= ); - } else if (virXMLNodeNameEqual(cur, "mouse")) { int modeVal; g_autofree char *mode =3D virXMLPropString(cur, "mode"); --=20 2.26.2