From nobody Tue Feb 10 03:45:14 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=1616054507; cv=none; d=zohomail.com; s=zohoarc; b=fwNlVX2pwJf6qXY4UoijGQPq1KLc2fQA6a8EGPfzHDYitrsIGIZ+SPegkXhbp9eHMo8ZtVomHlvuth2xWg0mKgcMOXSP7e5ZCUlJLKxNVuaR+gGvsN02PwJdV5pLFIGgH1mLV7IJ2XLqzcn7r1jyfqcfgbccyvQNijTcmWXdiek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054507; 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=BGm07Xbs6RocYrHkrtVNHtdNJvoeM2/JC9zUcu2mVno=; b=DHVR+O4RqnkUy0DwowaW5FmJNns7GVk9sJ0X8LfmhcUmw/IuHVjDDLDzS9Mjqm82qEsZZ+BZDlh/aOhSd9hKjsd63JRAfx9FnkFUxfHcILUQ7AJcPeckgPLY3Y81vbmjZvbV9meFibOLJHkRyWMGiSz5mcDqsFzIZ1NnW6Zwezk= 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 1616054507238553.7403826494126; Thu, 18 Mar 2021 01:01:47 -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-331-aM6PyDqDNkqv4k-BW_Xumw-1; Thu, 18 Mar 2021 04:01:43 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F0D78814337; Thu, 18 Mar 2021 08:01:36 +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 C9C36669F2; Thu, 18 Mar 2021 08:01:36 +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 88D904A7CB; Thu, 18 Mar 2021 08:01:36 +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 12I81WZL028197 for ; Thu, 18 Mar 2021 04:01:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id D1856669F2; Thu, 18 Mar 2021 08:01:32 +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 0BE8866FFF; Thu, 18 Mar 2021 08:01:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054506; 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=BGm07Xbs6RocYrHkrtVNHtdNJvoeM2/JC9zUcu2mVno=; b=iuW+phCCMqjtF0djsmU+hsiQNTMNWwS9U9YX7EVHlHvND1THkKHAx9SpJ1J1rJ3bs7wJ/d Tkgf0nrpEE3Q6EhSZPHVF3bqlRIQ7UtPNYWAgwGZ5rAOx60S9AyLVEQw+8MEjc3gLzfSLS ++TFhnvB+qCDXPE+Mfd5Zh9HagTAcPQ= X-MC-Unique: aM6PyDqDNkqv4k-BW_Xumw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainDiskDefDriverParseXML Date: Thu, 18 Mar 2021 09:00:48 +0100 Message-Id: <20210318080117.70255-10-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.79 on 10.5.11.15 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 | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e3e38ae30d..8dbf371e81 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9126,6 +9126,9 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr de= f, xmlXPathContextPtr ctxt) { g_autofree char *tmp =3D NULL; + virTristateSwitch ioeventfd =3D VIR_TRISTATE_SWITCH_ABSENT; + virTristateSwitch event_idx =3D VIR_TRISTATE_SWITCH_ABSENT; + virTristateSwitch copy_on_read =3D VIR_TRISTATE_SWITCH_ABSENT; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D cur; @@ -9165,29 +9168,17 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr = def, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "ioeventfd")) && - (def->ioeventfd =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk ioeventfd mode '%s'"), tmp); + if (virXMLPropOnOff(cur, "ioeventfd", &ioeventfd) < 0) return -1; - } - VIR_FREE(tmp); + def->ioeventfd =3D ioeventfd; =20 - if ((tmp =3D virXMLPropString(cur, "event_idx")) && - (def->event_idx =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk event_idx mode '%s'"), tmp); + if (virXMLPropOnOff(cur, "event_idx", &event_idx) < 0) return -1; - } - VIR_FREE(tmp); + def->event_idx =3D event_idx; =20 - if ((tmp =3D virXMLPropString(cur, "copy_on_read")) && - (def->copy_on_read =3D virTristateSwitchTypeFromString(tmp)) <=3D = 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk copy_on_read mode '%s'"), tmp); + if (virXMLPropOnOff(cur, "copy_on_read", ©_on_read) < 0) return -1; - } - VIR_FREE(tmp); + def->copy_on_read =3D copy_on_read; =20 if ((tmp =3D virXMLPropString(cur, "discard")) && (def->discard =3D virDomainDiskDiscardTypeFromString(tmp)) <=3D 0)= { --=20 2.26.2