From nobody Mon Feb 9 19:04:50 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=1616161519; cv=none; d=zohomail.com; s=zohoarc; b=KglHU6IyEvBV84YgEOjtkdD63TfInValzbv2jY3hXtDBGyRpe2SFf2K+4KHs3XfQeSV+Y4W+46ZS8aVsyU6Xu7i5mFKU8w9kBO0BcX+57WeQr7tse91Dl7UkZPZbnNhyuWbb22IBC4qvsKs8m2xrVCtjo5i6fyCkv8KilOXO6aU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161519; 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=7F29VkqrhsinZ3B5pNFsC3rBYij/tSabhN8RjpjdOuU=; b=J6/U5ketxINOF8I/uGIJGIet9tIuiATl1iRbbxEfOBj+ESXf1yVtclVbl/Z+twetsY68FPiuiVpbI2RninSQoBb3Ci1gdak6U2hYWD4UhB8rgIhBkKihIZFtHVu0lJzIUW7EptNGo/3XcqhWqfxlf5KLKQtmW7r9dM/VEriQO6M= 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 1616161519979267.0655907188442; Fri, 19 Mar 2021 06:45: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-50-Fh777CXcNGm_GZ6HT-GhsA-1; Fri, 19 Mar 2021 09:41:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98BD781630; Fri, 19 Mar 2021 13:41:47 +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 67BCE60CD7; Fri, 19 Mar 2021 13:41:47 +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 0F79E4A71B; Fri, 19 Mar 2021 13:41:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfgfM019509 for ; Fri, 19 Mar 2021 09:41:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1AC6239A65; Fri, 19 Mar 2021 13:41:42 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59C8063B8C; Fri, 19 Mar 2021 13:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161518; 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=7F29VkqrhsinZ3B5pNFsC3rBYij/tSabhN8RjpjdOuU=; b=JMxoFapglAJ+NMQb7kodAk7wJ+YqejwQMEd7QFHaWLuj0ki3mEwVMQYEW4B3bKxcAxfjQr eMihOv8pJUizFub9fcQItmh+nrr1PFIC2gD3APfRqqEn9ecFxUxzFNWrZ+c98Vz9wQh0EL rHyI3TzOkpjFYECRk4w3epHYFPLPScM= X-MC-Unique: Fh777CXcNGm_GZ6HT-GhsA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 22/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskDefDriverParseXML Date: Fri, 19 Mar 2021 14:40:36 +0100 Message-Id: <20210319134105.442774-23-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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.13 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 | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 39b1e237f5..ef7eed5682 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9133,29 +9133,14 @@ 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 (virXMLPropTristateSwitch(cur, "ioeventfd", false, &def->ioeventfd)= < 0) return -1; - } - VIR_FREE(tmp); =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 (virXMLPropTristateSwitch(cur, "event_idx", false, &def->event_idx)= < 0) return -1; - } - VIR_FREE(tmp); =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 (virXMLPropTristateSwitch(cur, "copy_on_read", false, &def->copy_on= _read) < 0) return -1; - } - VIR_FREE(tmp); =20 if ((tmp =3D virXMLPropString(cur, "discard")) && (def->discard =3D virDomainDiskDiscardTypeFromString(tmp)) <=3D 0)= { --=20 2.26.2