From nobody Mon Apr 29 09:07:11 2024 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=1616169750; cv=none; d=zohomail.com; s=zohoarc; b=QztRSV662+Owbd1dejZPcicPtDPBKoloCN8+EjVmff+dbq4WxR66qfQR+DIrJzq9+pC2w0obLDWGLkoiMu2lJ0ztNJ07F/FOFZKPOiXrHW0/h3DZrJBnx0JyG/7I5cks085JJkyKT2QIHCHD/EPmQ/GIUOQDmiljuz6ADxkkdW8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169750; 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=tK1Pht+QxxSj+QgdNlvXtknFa2PkQG8OL5cY0oQ4w5c=; b=DXby3kXfyk0c/c66dAtOC6womGEbUwfU4IcUVnQVohnKzhQwfzJYPFVYUFTB+A7GoSlHCLk7BmW/eE/ag4+Vlzv7DU6uw/BGrNGpE47i0vKggF5oLhls1XSuThCrwEqy6Ap+7vJ7y25/m4zSy9231P44k70ItRXO4sHlhg35VRg= 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 1616169750404799.528769851596; Fri, 19 Mar 2021 09:02:30 -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-405-j1_MgxpmMui6SsEMPmUnhA-1; Fri, 19 Mar 2021 11:58:16 -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 80F2B83DD21; Fri, 19 Mar 2021 15:58:08 +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 5A6BB60C5E; Fri, 19 Mar 2021 15:58:08 +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 1968C4A7C9; Fri, 19 Mar 2021 15:58:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFvsV6006200 for ; Fri, 19 Mar 2021 11:57:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF9BC16E3A; Fri, 19 Mar 2021 15:57:54 +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 ECDBC1A353; Fri, 19 Mar 2021 15:57:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169749; 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=tK1Pht+QxxSj+QgdNlvXtknFa2PkQG8OL5cY0oQ4w5c=; b=dhHnMfppjX0eU5WSUuPAw1zVlv2Vtm4QBl9UeJujetGxnGMU/mTKkH21PU0KiwLnAap1Mu lGtaeSOrexrLObRs1CnB6FysJ8C6hgT0htT3zcieB7nqUEVpiXbVYE7zYpcdHG6gEnSJud pyO5Sv7szU4oLVJkNyHKroaooJet+E4= X-MC-Unique: j1_MgxpmMui6SsEMPmUnhA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 01/51] conf: Use virTristateXXX in virStorageSource Date: Fri, 19 Mar 2021 16:56:58 +0100 Message-Id: <20210319155748.680146-2-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 12 ++++++++---- src/conf/storage_source_conf.h | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7671050134..3d24479f28 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8338,11 +8338,15 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, return -1; } =20 - if ((haveTLS =3D virXMLPropString(node, "tls")) && - (src->haveTLS =3D virTristateBoolTypeFromString(haveTLS)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown disk source 'tls' setting '%s'"), haveTLS); + if ((haveTLS =3D virXMLPropString(node, "tls"))) { + int value; + + if ((value =3D virTristateBoolTypeFromString(haveTLS)) <=3D 0) { + virReportError(VIR_ERR_XML_ERROR, + _("unknown disk source 'tls' setting '%s'"), ha= veTLS); return -1; + } + src->haveTLS =3D value; } =20 if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index f42bb1c67d..e6702a1ffc 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -356,7 +356,7 @@ struct _virStorageSource { char *nodestorage; /* name of the storage object */ =20 /* An optional setting to enable usage of TLS for the storage source */ - int haveTLS; /* enum virTristateBool */ + virTristateBool haveTLS; =20 /* Indication whether the haveTLS value was altered due to qemu.conf * setting when haveTLS is missing from the domain config file */ --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169488; cv=none; d=zohomail.com; s=zohoarc; b=MwjIE9M6TaIwCrnWiE4GCV0fw+GrynNjGWCZptMfmiKI8Pgfgwq1CWDnrh3taau8XaXoav7pMqKmZdL2toocAlIFvfmhjuqmgC2divIm3GktsGX/M6LrTmhL5LcwtUkiel1CPq9ScfhJXc6sEMfqDz3IfNtIWiSPa6EZw+V8lNY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169488; 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=7DCi0/O6rE7AK0HGqJ15r1sankE+wlBKgfCNYCfOVRE=; b=SI/PXuuCAKDrznsXC2JbMAZAGGFWuAURqzhg7i5Vgvlay24uKsyFtCYTUq6rEqO/ymhf8Yuc/YTQ5599z2YK/bBNNCl6ClZkPIvRi+lumCOO9SZgEF3QzJRyOMmLbMgp5C9r29+gvG6eMtnIK3WkRPgH7H+u5YKDizdgA0VzZmY= 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 1616169488743100.09854097389359; Fri, 19 Mar 2021 08:58:08 -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-474-2Naq73RHPVa40somxsvTeQ-1; Fri, 19 Mar 2021 11:58:04 -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 E955D108BD06; Fri, 19 Mar 2021 15:57:58 +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 BD0155D72F; Fri, 19 Mar 2021 15:57:58 +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 AF3051809C84; Fri, 19 Mar 2021 15:57:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFvt9n006205 for ; Fri, 19 Mar 2021 11:57:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id B9E1E16E3A; Fri, 19 Mar 2021 15:57:55 +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 0E40518E4B; Fri, 19 Mar 2021 15:57:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169487; 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=7DCi0/O6rE7AK0HGqJ15r1sankE+wlBKgfCNYCfOVRE=; b=b2mxYCggkBdYxRPO7sXyp0A3KyP9hdWWgStzk5q4Uy/S/f7YPxb7drd4Emc9jx/Mx92UxE e/2XZlU0XplqPZWyNNEZOU/puTn/zPYhVhyY3hvIXOBFb/C+ZR2CPfKW6tSh3c1qqqh+5B cMDb991ykTHqglwzrkw4P0Pre+macTM= X-MC-Unique: 2Naq73RHPVa40somxsvTeQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 02/51] conf: Use virTristateXXX in virStorageSourceNVMeDef Date: Fri, 19 Mar 2021 16:56:59 +0100 Message-Id: <20210319155748.680146-3-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 4 +++- src/conf/storage_source_conf.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3d24479f28..27eb98d93c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8478,12 +8478,14 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, } =20 if ((managed =3D virXMLPropString(node, "managed"))) { - if ((nvme->managed =3D virTristateBoolTypeFromString(managed)) <= =3D 0) { + int value; + if ((value =3D virTristateBoolTypeFromString(managed)) <=3D 0) { virReportError(VIR_ERR_XML_ERROR, _("malformed managed value '%s'"), managed); return -1; } + nvme->managed =3D value; } =20 if (!(address =3D virXPathNode("./address", ctxt))) { diff --git a/src/conf/storage_source_conf.h b/src/conf/storage_source_conf.h index e6702a1ffc..1783dc195e 100644 --- a/src/conf/storage_source_conf.h +++ b/src/conf/storage_source_conf.h @@ -251,7 +251,7 @@ typedef struct _virStorageSourceNVMeDef virStorageSourc= eNVMeDef; typedef virStorageSourceNVMeDef *virStorageSourceNVMeDefPtr; struct _virStorageSourceNVMeDef { unsigned long long namespc; - int managed; /* enum virTristateBool */ + virTristateBool managed; virPCIDeviceAddress pciAddr; =20 /* Don't forget to update virStorageSourceNVMeDefCopy */ --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169502; cv=none; d=zohomail.com; s=zohoarc; b=fCWFt6D4ipi8s/65WimI80H5++advPLnjdfbV9/zVDUyGLPf1farY+TUIP4FTUMMZt6irc9hqAafXC3kC8mTlTy3jwC29S3/P7XoXAQfbyRGHNmr6Thgywjn8jP/30Se854InWbsRB0wlL8nMqdBPU9MMwFQJHNe/bhfw++Ep9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169502; 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=TFQy74cPjahEXUoSEoES4wwP+ff6hcJg/7bB0oSJjpA=; b=JmsmY+qLc6BPZXp1LqP18/KQsYS2rIFEkMxgCM8RPaDCMBZLrIsV/RV9MEi1tLZWo/6EIJyHTg1B0RmpVbMnWLiWGwLEU0w6pomm/5b8cWkqYSdd5Hu+/i0Ff95OJS/1X8e0jv4bCNJR0Q6wKxSFhCUpvYT/CDS8FqErsAn9WLg= 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 161616950280995.42440823318793; Fri, 19 Mar 2021 08:58:22 -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-105-c1kp8_6fOCaolHxPuIQPeA-1; Fri, 19 Mar 2021 11:58:19 -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 BA38A83DD28; Fri, 19 Mar 2021 15:58:12 +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 890A45D730; Fri, 19 Mar 2021 15:58:12 +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 499154A704; Fri, 19 Mar 2021 15:58:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFvu3J006215 for ; Fri, 19 Mar 2021 11:57:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id C873D16E3A; Fri, 19 Mar 2021 15:57:56 +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 17D911A353; Fri, 19 Mar 2021 15:57:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169501; 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=TFQy74cPjahEXUoSEoES4wwP+ff6hcJg/7bB0oSJjpA=; b=cebuVwP2wBI2ziS9xVNof+djhbV02QfLvCuABJufksyCSN8lOjswKKdtrYgU9YWtgl6FFJ eydPZWIWbIGUUaJQpn72zLAbJWPKOYX8QTbhOXWKeC3hd3ym0WUOxqKc1hlHcKjYN1IA7Y iHb/lKx87+Bajo1t+uUnrIvbXA5nZO8= X-MC-Unique: c1kp8_6fOCaolHxPuIQPeA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 03/51] conf: Use virTristateXXX in virDomainDeviceInfo Date: Fri, 19 Mar 2021 16:57:00 +0100 Message-Id: <20210319155748.680146-4-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/device_conf.h | 4 ++-- src/conf/domain_conf.c | 26 ++++++++++++++++---------- src/qemu/qemu_command.c | 3 ++- src/qemu/qemu_hotplug.c | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index a51bdf10ee..289af1153a 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -153,8 +153,8 @@ struct _virDomainDeviceInfo { } master; /* rombar and romfile are only used for pci hostdev and network * devices. */ - int romenabled; /* enum virTristateBool */ - int rombar; /* enum virTristateSwitch */ + virTristateBool romenabled; + virTristateSwitch rombar; char *romfile; /* bootIndex is only used for disk, network interface, hostdev * and redirdev devices */ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 27eb98d93c..43789fa2c7 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6681,17 +6681,23 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr x= mlopt, =20 if ((flags & VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) && (rom =3D virXPathNode("./rom", ctxt))) { - if ((romenabled =3D virXPathString("string(./rom/@enabled)", ctxt)= ) && - ((info->romenabled =3D virTristateBoolTypeFromString(romenable= d)) <=3D 0)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown rom enabled value '%s'"), romenabled= ); - goto cleanup; + if ((romenabled =3D virXPathString("string(./rom/@enabled)", ctxt)= )) { + int value; + if ((value =3D virTristateBoolTypeFromString(romenabled)) <=3D= 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown rom enabled value '%s'"), romena= bled); + goto cleanup; + } + info->romenabled =3D value; } - if ((rombar =3D virXPathString("string(./rom/@bar)", ctxt)) && - ((info->rombar =3D virTristateSwitchTypeFromString(rombar)) <= =3D 0)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown rom bar value '%s'"), rombar); - goto cleanup; + if ((rombar =3D virXPathString("string(./rom/@bar)", ctxt))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(rombar)) <=3D 0= ) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown rom bar value '%s'"), rombar); + goto cleanup; + } + info->rombar =3D value; } info->romfile =3D virXMLPropString(rom, "file"); =20 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 5717f7b98d..73c28ed7a0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -660,7 +660,8 @@ qemuBuildRomStr(virBufferPtr buf, case VIR_TRISTATE_SWITCH_ON: virBufferAddLit(buf, ",rombar=3D1"); break; - default: + case VIR_TRISTATE_SWITCH_ABSENT: + case VIR_TRISTATE_SWITCH_LAST: break; } if (info->romfile) { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a66354426d..cc49f10198 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3665,7 +3665,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver, =20 /* device alias is checked already in virDomainDefCompatibleDevice */ =20 - if (newdev->info.rombar =3D=3D VIR_TRISTATE_BOOL_ABSENT) + if (newdev->info.rombar =3D=3D VIR_TRISTATE_SWITCH_ABSENT) newdev->info.rombar =3D olddev->info.rombar; if (olddev->info.rombar !=3D newdev->info.rombar) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169506; cv=none; d=zohomail.com; s=zohoarc; b=JObiyvVTwN0TGYlh3aLHV/xrpY/6+sHFzxfkcaTkSaSbAgc4DMznJPazRgs0imRtpi2gKV3YMCwpZim5VTum4+Q1PZBIOmWUfjqMIYk2KD3CAI80wriDbLRoyi2ZhyQCsnEtMCEolv3mMZC67JU1eKbFMtqzh0zSzDvMOl5RRL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169506; 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=gUlO/ajlS6YK1A3eErN1ZrDnRrYJlvGphojLC48QiP8=; b=BKTyc5xkWBX+K1avZB0uETVnI/BjrkB2TE6zkTWef6x9ff9/hMR0Yb+Do1MjrbiGLxVUAT04jrfjdwW8jOHfSFoSbcjs/BzBU2iiSZ6chEylADuo6AmbgMhR/bnD1Um0dZES9sgF2hsvItwGA5mWLj4l0c2SAkRsraIbbAh6bE4= 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 1616169506630155.02998140132354; Fri, 19 Mar 2021 08:58:26 -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-47-pZSUk2l7OxacKm6WMYs8IQ-1; Fri, 19 Mar 2021 11:58:23 -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 E01C483DD32; Fri, 19 Mar 2021 15:58:15 +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 BB4E450EDE; Fri, 19 Mar 2021 15:58:15 +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 76EDE1802138; Fri, 19 Mar 2021 15:58:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFvv2X006240 for ; Fri, 19 Mar 2021 11:57:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id D8C8416E3A; Fri, 19 Mar 2021 15:57:57 +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 2868218E4B; Fri, 19 Mar 2021 15:57:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169505; 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=gUlO/ajlS6YK1A3eErN1ZrDnRrYJlvGphojLC48QiP8=; b=DaAuavIDK24d9N4q2cHn4KdEqoVqDmdM4kmjnLSj+DfTsZ4XvJbCK8c/NxN27FKMQtbO2w EnmmahU8kY3F+fseQpNFKf9tqOsxAdjRjiGrsruPIReg/zpXFM54mYBIYnARESdipTECv2 53EXp4N52jZPDECDtVJbRZiDn4+9Mcg= X-MC-Unique: pZSUk2l7OxacKm6WMYs8IQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 04/51] conf: Use virTristateXXX in virDomainDiskDef Date: Fri, 19 Mar 2021 16:57:01 +0100 Message-Id: <20210319155748.680146-5-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 39 ++++++++++++++++++++++++--------------- src/conf/domain_conf.h | 6 +++--- 2 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 43789fa2c7..014f318dcd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9196,27 +9196,36 @@ 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); - return -1; + if ((tmp =3D virXMLPropString(cur, "ioeventfd"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk ioeventfd mode '%s'"), tmp); + return -1; + } + def->ioeventfd =3D value; } 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); - return -1; + if ((tmp =3D virXMLPropString(cur, "event_idx"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk event_idx mode '%s'"), tmp); + return -1; + } + def->event_idx =3D value; } 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); - return -1; + if ((tmp =3D virXMLPropString(cur, "copy_on_read"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk copy_on_read mode '%s'"), tmp); + return -1; + } + def->copy_on_read =3D value; } VIR_FREE(tmp); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 87bc7e8625..853cab96b5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -568,9 +568,9 @@ struct _virDomainDiskDef { int error_policy; /* enum virDomainDiskErrorPolicy */ int rerror_policy; /* enum virDomainDiskErrorPolicy */ int iomode; /* enum virDomainDiskIo */ - int ioeventfd; /* enum virTristateSwitch */ - int event_idx; /* enum virTristateSwitch */ - int copy_on_read; /* enum virTristateSwitch */ + virTristateSwitch ioeventfd; + virTristateSwitch event_idx; + virTristateSwitch copy_on_read; int snapshot; /* virDomainSnapshotLocation, snapshot_conf.h */ int startupPolicy; /* enum virDomainStartupPolicy */ bool transient; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169616; cv=none; d=zohomail.com; s=zohoarc; b=MHxR8OFWkQgTEDCMK5iG/gcqcTOO9tLLLhtvw+shn81aZxUAwYj+KQ+63aCmegG6vmYyOmMqY188jeVicwh5fHeD81vi5+qQ+SYsffuN5awNCWklTp5PVtbKMOowxQrV2iDx5i6hxu1CGD1zAraXX8zkFAs8rjc7qItDRXtAl4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169616; 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=qFzdNLhVufcTWhcWSrJgjtd9AQ4fxa3Qu0UlniKST4A=; b=VGDzT5xu9hUblLAoPYWjQ/PDIaPk4sLyYBDDaJAirNe21BRRk6icHDbmfvSbh9j1BxYOAmgzW+zhoo7Pv0PeVVTPdVlWgNHvuV3MX1xIsEAv4AUD9PETS8ucPuV0SO2Lao02wDYvPkqKNMhLHBtY/nSZWpKJ9Gv+SsrfzdmEC4I= 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 1616169616529643.6222754775043; Fri, 19 Mar 2021 09:00:16 -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-317-97rWz1J3MR6deELMp1cInw-1; Fri, 19 Mar 2021 11:58:26 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C49E5800D53; Fri, 19 Mar 2021 15:58:19 +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 956B810013D7; Fri, 19 Mar 2021 15:58:19 +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 2451218045CA; Fri, 19 Mar 2021 15:58:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFvwPt006253 for ; Fri, 19 Mar 2021 11:57:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id EA7481A353; Fri, 19 Mar 2021 15:57:58 +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 3994E18E4B; Fri, 19 Mar 2021 15:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169612; 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=qFzdNLhVufcTWhcWSrJgjtd9AQ4fxa3Qu0UlniKST4A=; b=LVdm95UCPQ1kAXOEasnPhDaOgj/Xx1iZkYDx1o29AfOdm8WSB84YRtmedLUNFBf3itZr3N w2asiuSX3JhYNaL+or87+HWw1Oc/xAdqEs0wu9T20ObjDyQjo/nPmgYGXWlCbJKJdbtqBc YrYZ3Ae+5F8QzCCog4IcKDcFKFwbrqk= X-MC-Unique: 97rWz1J3MR6deELMp1cInw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 05/51] conf: Use virTristateXXX in virDomainActualNetDef Date: Fri, 19 Mar 2021 16:57:02 +0100 Message-Id: <20210319155748.680146-6-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 17 +++++++++-------- src/conf/domain_conf.h | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 014f318dcd..8e94860b51 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10551,14 +10551,15 @@ virDomainActualNetDefParseXML(xmlNodePtr node, goto error; } =20 - trustGuestRxFilters =3D virXMLPropString(node, "trustGuestRxFilters"); - if (trustGuestRxFilters && - ((actual->trustGuestRxFilters - =3D virTristateBoolTypeFromString(trustGuestRxFilters)) <=3D 0))= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown trustGuestRxFilters value '%s'"), - trustGuestRxFilters); - goto error; + if ((trustGuestRxFilters =3D virXMLPropString(node, "trustGuestRxFilte= rs"))) { + int value; + if ((value =3D virTristateBoolTypeFromString(trustGuestRxFilters))= <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown trustGuestRxFilters value '%s'"), + trustGuestRxFilters); + goto error; + } + actual->trustGuestRxFilters =3D value; } =20 virtPortNode =3D virXPathNode("./virtualport", ctxt); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 853cab96b5..90079d7e64 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -994,7 +994,7 @@ struct _virDomainActualNetDef { virNetDevVPortProfilePtr virtPortProfile; virNetDevBandwidthPtr bandwidth; virNetDevVlan vlan; - int trustGuestRxFilters; /* enum virTristateBool */ + virTristateBool trustGuestRxFilters; virTristateBool isolatedPort; unsigned int class_id; /* class ID for bandwidth 'floor' */ }; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169513; cv=none; d=zohomail.com; s=zohoarc; b=FWtgx24OyEXCgodqs8JU5judevR2c1DsNKUP8vn3TeWLKVoTXR1hPm6zViwv7Aba9TiXNI8hj3G/+Hv9zhpYhdduVnhN276XmgSquUguWchNVqD+ox59fOT8hioCBm62ziF13rw2Io+k3MiQW9O+VUEBYXvvnGsT1KDjPsQi200= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169513; 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=eYkTg6qYhflYvRq5YYHklmWgPRBHQbah4FlJEWxngN4=; b=SXaWt8ZT/JY4PpTjQM/avYDMTYQm1+q912dn1UlGlM4uq7nshh5dV1hPtUV1JB1F0+opAty2VQE2ogMoLLvgswzonv+Gp0ZJwLFraAYro77jjfOuSbFUwQML+OyMh+4u480TsqxQOL9we+KTgHI5O4R2Qz+Wg8j2FNMGATWlStE= 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 1616169513427653.2211348679723; Fri, 19 Mar 2021 08:58:33 -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-43-s8AJeh64NhKmpcDPpI1QyQ-1; Fri, 19 Mar 2021 11:58:29 -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 EA7CB9CC0B; Fri, 19 Mar 2021 15:58:22 +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 C2B0850DD3; Fri, 19 Mar 2021 15:58:22 +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 87F6C4A70C; Fri, 19 Mar 2021 15:58:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw0OH006263 for ; Fri, 19 Mar 2021 11:58:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 07C8E16E3A; Fri, 19 Mar 2021 15:58:00 +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 494481A353; Fri, 19 Mar 2021 15:57:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169512; 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=eYkTg6qYhflYvRq5YYHklmWgPRBHQbah4FlJEWxngN4=; b=MIblS6FjK60E3uGY06Om0+tRgTkN/EO4fPPhTPD6Ff0mwE+fWQuIUY5kD6oASSsyx4txeg 7e6MOpPeV9P1XdTp+jbeedFpGrtJ9N0DMsMbImEXyXIq4cMRy91cAInj7BF0UN7i30B06Q 6h8KfnPhfCER2dgePQvYYJfAwdQ2Hc8= X-MC-Unique: s8AJeh64NhKmpcDPpI1QyQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 06/51] conf: Use virTristateXXX in virDomainNetDef Date: Fri, 19 Mar 2021 16:57:03 +0100 Message-Id: <20210319155748.680146-7-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 17 +++++++++-------- src/conf/domain_conf.h | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8e94860b51..9f59756119 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10854,14 +10854,15 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xml= opt, def->type =3D VIR_DOMAIN_NET_TYPE_USER; } =20 - trustGuestRxFilters =3D virXMLPropString(node, "trustGuestRxFilters"); - if (trustGuestRxFilters && - ((def->trustGuestRxFilters - =3D virTristateBoolTypeFromString(trustGuestRxFilters)) <=3D 0))= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown trustGuestRxFilters value '%s'"), - trustGuestRxFilters); - goto error; + if ((trustGuestRxFilters =3D virXMLPropString(node, "trustGuestRxFilte= rs"))) { + int value; + if ((value =3D virTristateBoolTypeFromString(trustGuestRxFilters))= <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown trustGuestRxFilters value '%s'"), + trustGuestRxFilters); + goto error; + } + def->trustGuestRxFilters =3D value; } =20 cur =3D node->children; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 90079d7e64..15dc416384 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1102,7 +1102,7 @@ struct _virDomainNetDef { GHashTable *filterparams; virNetDevBandwidthPtr bandwidth; virNetDevVlan vlan; - int trustGuestRxFilters; /* enum virTristateBool */ + virTristateBool trustGuestRxFilters; virTristateBool isolatedPort; int linkstate; unsigned int mtu; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169544; cv=none; d=zohomail.com; s=zohoarc; b=TYYiXM4oxTadeRCcODyE/+MyXu9NgSW1F6V9T5Un7VpJ1yRPpfJnVLXCfKPG9kISDwvplyAbxTwaKv8I5q54X+OuRvNsHTb+GzzWkwNyONJkA6EyO5Yu5z+oJiYiKid5s9D4Ur8gyeR1hn8qbRCxrSSVeFfpZggX5GU5THKaTLM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169544; 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=m+xHuqTq0Hj3b5XxGnQt4dWTM2rs6q2d4+7JsPyIRSY=; b=EKnojmwiUhQJxmvaTZIxmErGWeSAgnFYNEaZvDMCr/JeG3ZQRLb2CKVT2+usy5wN4sXCWyJzWVC+h+0JWGS6dRFXo7+xzO3mxAB0kTFNEsyfgRKq2i9Qc+kyUE+ef65E8VJYIc7kqoHG/1Ose/5OSVWHG1F4fBf22z+8dDp9uYY= 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 1616169544159455.01275521844; Fri, 19 Mar 2021 08:59:04 -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-215-Ew8RXOLxOci78VILlm1u5w-1; Fri, 19 Mar 2021 11:58:11 -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 A2D43185FFCE; Fri, 19 Mar 2021 15:58:04 +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 7C89B60871; Fri, 19 Mar 2021 15:58:04 +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 26E0D1800662; Fri, 19 Mar 2021 15:58:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw1ld006274 for ; Fri, 19 Mar 2021 11:58:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 166A216E3A; Fri, 19 Mar 2021 15:58:01 +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 5C6EC18E4B; Fri, 19 Mar 2021 15:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169542; 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=m+xHuqTq0Hj3b5XxGnQt4dWTM2rs6q2d4+7JsPyIRSY=; b=gAVnrvJDGgK33Xy0aQzvas8clU7yptHTVwaSZh6dZu5pbk0B5w8AJ9fmlTTKg3yyY5R5AZ OW1Lj7wKFVHL1sJ+aps774H2e0n5gjcr0FYmpv0WWkd97EznUKUEZ/Gkfdt0sF4kH184Gw kzYfzEdB+jTdTZAH55DAHWaENlUx1ck= X-MC-Unique: Ew8RXOLxOci78VILlm1u5w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 07/51] conf: Use virTristateXXX in virDomainChrSourceDef Date: Fri, 19 Mar 2021 16:57:04 +0100 Message-Id: <20210319155748.680146-8-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 34 +++++++++++++++++++++------------- src/conf/domain_conf.h | 6 +++--- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9f59756119..e99699028a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11891,12 +11891,14 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceD= efPtr def, def->data.tcp.service =3D virXMLPropString(source, "service"); =20 if ((tmp =3D virXMLPropString(source, "tls"))) { - if ((def->data.tcp.haveTLS =3D virTristateBoolTypeFromString(tmp))= <=3D 0) { + int value; + if ((value =3D virTristateBoolTypeFromString(tmp)) <=3D 0) { virReportError(VIR_ERR_XML_ERROR, _("unknown chardev 'tls' setting '%s'"), tmp); return -1; } + def->data.tcp.haveTLS =3D value; VIR_FREE(tmp); } =20 @@ -11975,12 +11977,15 @@ virDomainChrSourceDefParseFile(virDomainChrSource= DefPtr def, =20 def->data.file.path =3D virXMLPropString(source, "path"); =20 - if ((append =3D virXMLPropString(source, "append")) && - (def->data.file.append =3D virTristateSwitchTypeFromString(append)= ) <=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), - append); - return -1; + if ((append =3D virXMLPropString(source, "append"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(append)) <=3D 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid append attribute value '%s'"), + append); + return -1; + } + def->data.file.append =3D value; } =20 return 0; @@ -12016,12 +12021,15 @@ virDomainChrSourceDefParseLog(virDomainChrSourceD= efPtr def, =20 def->logfile =3D virXMLPropString(log, "file"); =20 - if ((append =3D virXMLPropString(log, "append")) && - (def->logappend =3D virTristateSwitchTypeFromString(append)) <=3D = 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), - append); - return -1; + if ((append =3D virXMLPropString(log, "append"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(append)) <=3D 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid append attribute value '%s'"), + append); + return -1; + } + def->logappend =3D value; } =20 return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 15dc416384..6619b9f006 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1232,7 +1232,7 @@ struct _virDomainChrSourceDef { /* no for null, vc, stdio */ struct { char *path; - int append; /* enum virTristateSwitch */ + virTristateSwitch append; } file; /* pty, file, pipe, or device */ struct { char *master; @@ -1244,7 +1244,7 @@ struct _virDomainChrSourceDef { bool listen; int protocol; bool tlscreds; - int haveTLS; /* enum virTristateBool */ + virTristateBool haveTLS; bool tlsFromConfig; virDomainChrSourceReconnectDef reconnect; } tcp; @@ -1265,7 +1265,7 @@ struct _virDomainChrSourceDef { } spiceport; } data; char *logfile; - int logappend; + virTristateSwitch logappend; =20 size_t nseclabels; virSecurityDeviceLabelDefPtr *seclabels; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169503; cv=none; d=zohomail.com; s=zohoarc; b=hk+f+K2/4Kc6MZH6ZbUpqnwP+VDhb0PBcMXgwTrWXraB/PeGrYfjRjSqn/T/N24UWcpjKZWykGscGlsoasq0ODlhPQU7y3sj1c0BfG+rUasJ5vGhrong9ziwNjaCmlJOuoxlFMneTcKu0y4ddce811+t9rQOLxRc7T+9irHg6LM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169503; 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=nBK0BZco1wWP+OtThxphr8wxAGnclz372aJoq/6+6mo=; b=izcplFSI3WohFpN7p/vo0ibYMrbPIFFKxWe7uxbmvtQ5oJOra4ea9nxDhCR+zEiQtru9vcCzLpSizydxHqjcstaDuHibSm/xyh6tYJf95miZLSMu6BcQdgjHNabxr+O8UDESPDNS8hct90rcWLus0UPuyPMDOXpRNZZMi+dGFYQ= 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 161616950311685.82313611551467; Fri, 19 Mar 2021 08:58:23 -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-1-lYwAOwW5NRSim7V4unsxuA-1; Fri, 19 Mar 2021 11:58:18 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8FA483DD2D; Fri, 19 Mar 2021 15:58:10 +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 84AA860BF1; Fri, 19 Mar 2021 15:58: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 47237180B451; Fri, 19 Mar 2021 15:58:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw2Kn006284 for ; Fri, 19 Mar 2021 11:58:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 23B791C94B; Fri, 19 Mar 2021 15:58:02 +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 693501A353; Fri, 19 Mar 2021 15:58:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169502; 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=nBK0BZco1wWP+OtThxphr8wxAGnclz372aJoq/6+6mo=; b=jP37lQdsvo64OhHZn8eK//nMxZtCu2sCc3GOZ2tWTE5M/8bfJmpA+Ev86CNMzzPg3hPNnK FupcqsRBWUhIoT7rCTvBoLEPTaoamTMBo2mXpULqEZg/JYHm0XiSNEPG3TI2w1314q7t/Z Al6NedOxBoKsbS3MZdyt5bB0IY5FfQg= X-MC-Unique: lYwAOwW5NRSim7V4unsxuA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 08/51] conf: Use virTristateXXX in virDomainGraphicsDef Date: Fri, 19 Mar 2021 16:57:05 +0100 Message-Id: <20210319155748.680146-9-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.12 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6619b9f006..09b697432d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1862,7 +1862,7 @@ struct _virDomainGraphicsDef { int image; int jpeg; int zlib; - int playback; + virTristateSwitch playback; int streaming; virTristateBool copypaste; virTristateBool filetransfer; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169505; cv=none; d=zohomail.com; s=zohoarc; b=EFwYstlfGmzfSxfXxopW1Hyt5MNsmQrABnpDHjIxsKN/Th0pBOsYaK5zvWyo2QHirdzkwpAkt3tIYW554QOlt1yJ2IsA/KxR9FnLvXnQeQCINrG8mDQLSNJe7SPZsWyFJQFjy3iimYG038LcJRGHw6/IS1odN2xAtvchjuYPs/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169505; 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=RCHZif9eyHavLvUu3wz0pREdC56t5aH3qdLndxMG/Nw=; b=WrUJ7OQYCWuFHXLI6HbMWOc0BKpZnRylynudD2VmTqJ33LwD6O8UooJA2ju1O79tDYZvxmGYLc+oxXioS/DLy719vJgusCE6tGxCTRo4iD9unlmTMbpbXu00d7X2UrhQ3ujrwnWaZ96NUHSmpZvIfs7lOzTwifMbX1MCKHED04s= 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 1616169505980985.0354077987156; Fri, 19 Mar 2021 08:58:25 -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-387-CAvE6mv9P9aqoUPxDr8Tpw-1; Fri, 19 Mar 2021 11:58:22 -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 301429CC12; Fri, 19 Mar 2021 15:58:14 +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 D9BE75D740; Fri, 19 Mar 2021 15:58:13 +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 921731800848; Fri, 19 Mar 2021 15:58:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw3Ab006291 for ; Fri, 19 Mar 2021 11:58:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3DEA41C95E; Fri, 19 Mar 2021 15:58:03 +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 782681A353; Fri, 19 Mar 2021 15:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169505; 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=RCHZif9eyHavLvUu3wz0pREdC56t5aH3qdLndxMG/Nw=; b=SB0M0MbYl+aAIkKwGLnmJDcEw3W+sXah43uGovZvGfHeuubCgNif3szaCcoDrdf7AzUSYB ajKMS/YH4x6o5jgl18R8DjoofmJwQYwhMr9+Y69JsrZZABwxUYDRD7KLCYuWaVGFtmFgU2 pBVyegRQkbOYFswsV9bd/U3e0DRewWw= X-MC-Unique: CAvE6mv9P9aqoUPxDr8Tpw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 09/51] conf: Use virTristateXXX in virDomainMemballoonDef Date: Fri, 19 Mar 2021 16:57:06 +0100 Message-Id: <20210319155748.680146-10-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 26 ++++++++++++++++---------- src/conf/domain_conf.h | 4 ++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e99699028a..0480fc610d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14547,18 +14547,24 @@ virDomainMemballoonDefParseXML(virDomainXMLOption= Ptr xmlopt, goto error; } =20 - if ((deflate =3D virXMLPropString(node, "autodeflate")) && - (def->autodeflate =3D virTristateSwitchTypeFromString(deflate)) <= =3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid autodeflate attribute value '%s'"), defl= ate); - goto error; + if ((deflate =3D virXMLPropString(node, "autodeflate"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(deflate)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid autodeflate attribute value '%s'"), = deflate); + goto error; + } + def->autodeflate =3D value; } =20 - if ((freepage_reporting =3D virXMLPropString(node, "freePageReporting"= )) && - (def->free_page_reporting =3D virTristateSwitchTypeFromString(free= page_reporting)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid freePageReporting attribute value '%s'")= , freepage_reporting); - goto error; + if ((freepage_reporting =3D virXMLPropString(node, "freePageReporting"= ))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(freepage_reporting)= ) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid freePageReporting attribute value '%= s'"), freepage_reporting); + goto error; + } + def->free_page_reporting =3D value; } =20 ctxt->node =3D node; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 09b697432d..2d342effb1 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1921,8 +1921,8 @@ struct _virDomainMemballoonDef { int model; virDomainDeviceInfo info; int period; /* seconds between collections */ - int autodeflate; /* enum virTristateSwitch */ - int free_page_reporting; /* enum virTristateSwitch */ + virTristateSwitch autodeflate; + virTristateSwitch free_page_reporting; virDomainVirtioOptionsPtr virtio; }; =20 --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169613; cv=none; d=zohomail.com; s=zohoarc; b=bbu5EfRsVautZhuazaKQ9QmDEmXnZhc3dwkTV2DGl+5Aj9x0jVr/LWrg4w3BjZWK17JbWfGC6kp6YZ4Z5Esi/eIk0BmWMealSOLSlWopKIPOffGiCKXzJ6bNwIACNdnafCj5V7+qT8MSjCuv4N2HZUcNMIebDtZShMhv440or0s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169613; 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=7Eu/tcaitSGUprbHLf8xDbHXfMX0Rx9Wm0Tapt0yjBQ=; b=LX2kqN78pzGTeDAM3j9NsP+Ly4vlNZAHIgZHy6XWU+Ku4vdlUKevMfyWGeweruV3DofBuArBEBNYlAp+pDrVJZOvhKAWwwCNeMwMcmZG+eklaSqjCKOQd7K3XQHem9Z15s44kEDRvGQQAHSG/rYXFHUKphR6KKFOlzMIQyeEYPE= 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 161616961351630.733689749059863; Fri, 19 Mar 2021 09:00:13 -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-394-60PVLlqqM6mgGN97UGhbdw-1; Fri, 19 Mar 2021 11:58:23 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 548709CC10; Fri, 19 Mar 2021 15:58:17 +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 258A710013D6; Fri, 19 Mar 2021 15:58:17 +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 DA5D04A705; Fri, 19 Mar 2021 15:58:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw4KP006300 for ; Fri, 19 Mar 2021 11:58:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 609C21C95E; Fri, 19 Mar 2021 15:58:04 +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 92C951A353; Fri, 19 Mar 2021 15:58:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169611; 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=7Eu/tcaitSGUprbHLf8xDbHXfMX0Rx9Wm0Tapt0yjBQ=; b=h+H9y/SjJOMoo9575BXhA2AMmsdSPUc0MGZefD5qS1Dzhgd/T7qm0CBhReIW188B2HJ6+z AECB9YgFnquCjDlx0GP8++yfmbsE7yfrb1F52QOjvujueEKrEXQXBzxxrLrnT6rKNHc4Nn BA90pDPN3Uku5gilhCGC6jluuGO2sDs= X-MC-Unique: 60PVLlqqM6mgGN97UGhbdw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 10/51] conf: Use virTristateXXX in virDomainLoaderDef Date: Fri, 19 Mar 2021 16:57:07 +0100 Message-Id: <20210319155748.680146-11-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 26 ++++++++++++++++---------- src/conf/domain_conf.h | 4 ++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0480fc610d..9e106b8846 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19198,18 +19198,24 @@ virDomainLoaderDefParseXML(xmlNodePtr node, VIR_FREE(loader->path); } =20 - if (readonly_str && - (loader->readonly =3D virTristateBoolTypeFromString(readonly_str))= <=3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown readonly value: %s"), readonly_str); - return -1; + if (readonly_str) { + int value; + if ((value =3D virTristateBoolTypeFromString(readonly_str)) <=3D 0= ) { + virReportError(VIR_ERR_XML_DETAIL, + _("unknown readonly value: %s"), readonly_str); + return -1; + } + loader->readonly =3D value; } =20 - if (secure_str && - (loader->secure =3D virTristateBoolTypeFromString(secure_str)) <= =3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown secure value: %s"), secure_str); - return -1; + if (secure_str) { + int value; + if ((value =3D virTristateBoolTypeFromString(secure_str)) <=3D 0) { + virReportError(VIR_ERR_XML_DETAIL, + _("unknown secure value: %s"), secure_str); + return -1; + } + loader->secure =3D value; } =20 if (type_str) { diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2d342effb1..d6ca5e9725 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2152,9 +2152,9 @@ VIR_ENUM_DECL(virDomainLoader); =20 struct _virDomainLoaderDef { char *path; - int readonly; /* enum virTristateBool */ + virTristateBool readonly; virDomainLoader type; - int secure; /* enum virTristateBool */ + virTristateBool secure; char *nvram; /* path to non-volatile RAM */ char *templt; /* user override of path to master nvram */ }; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169510; cv=none; d=zohomail.com; s=zohoarc; b=V+nx9GV8jy2gW9Ata1sBvWFIF2Q2yK6mrLdV+EHUsOLqITmQ9H0oYuhB6kRtNqyxJ5ZGowMiqivpa9hMlyq9oQvb/O8yJhATHfB+A/m0t8ezTEKCfuR0tkO03+QXI4jLR0/30IfTay2b76oDcX0L/OpVDu9WQFzrCImZ+tEaOvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169510; 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=u07U79Vo2ayINM+3xFrRKjwx4gSnbbXAVzcSTuzcA1s=; b=e6H8MksYodhdaTDP+vYsXyG8NDU28mOJpQPj9FqmwMJsj4qEMK8H7XwvsyOM5nCfgjW288u8u60+sWJUidSER/n9ThZ5FPXbzfmhfAWYDyEBazppo4fAdfmWOLQ22R7fBSdNJNi1GEBdORvdwWk2lxib1pYfDyU5Ox7zVVa/WmE= 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 1616169510740784.2743828440957; Fri, 19 Mar 2021 08:58:30 -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-320-fV_eXNmeMVaFs4Apgzo2_Q-1; Fri, 19 Mar 2021 11:58:27 -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 87BE69CC07; Fri, 19 Mar 2021 15:58:21 +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 62E2260871; Fri, 19 Mar 2021 15:58:21 +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 215714A70A; Fri, 19 Mar 2021 15:58:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw57n006310 for ; Fri, 19 Mar 2021 11:58:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7D97218E4B; Fri, 19 Mar 2021 15:58:05 +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 BADC51A353; Fri, 19 Mar 2021 15:58:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169509; 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=u07U79Vo2ayINM+3xFrRKjwx4gSnbbXAVzcSTuzcA1s=; b=IGWtmgUwzZDPztL96FutYIGiffnuBrUjeBgShCw2h79pBjVPTS+0QnIm7y0VzK4NlhZiyw kDLu7rLm1+Pagq9C60uzyTf7AUugRcSD7E+NcQk6jG0saXsBxQo9vh7ed4FG5fwmf0kkE5 6IVB+yBOBJSQxAkJrFAjz8EurqQj6Uo= X-MC-Unique: fV_eXNmeMVaFs4Apgzo2_Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 11/51] conf: Use virTristateXXX in virDomainDef Date: Fri, 19 Mar 2021 16:57:08 +0100 Message-Id: <20210319155748.680146-12-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d6ca5e9725..25af058241 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2755,7 +2755,7 @@ struct _virDomainDef { virDomainHPTResizing hpt_resizing; unsigned long long hpt_maxpagesize; /* Stored in KiB */ char *hyperv_vendor_id; - int apic_eoi; + virTristateSwitch apic_eoi; =20 bool tseg_specified; unsigned long long tseg_size; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169515; cv=none; d=zohomail.com; s=zohoarc; b=gnmV+9iIhfz/9Jy1fyxirulGeX37fIM7glufdUj9FLyNq4/rRxRkIlJpBYlA1PO8j6oPDBFOXL3ouBwUwZtYDlLhYW5DgsVBy6ZXdqsKzAYP1XTNWw3hMYzp11Lv3cMO7TLZMIIqMiYwCTHPX2/K5Dax0j0cAeflf3EhHg8rB4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169515; 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=bfUzRKHHM0DdI3Z/W9dab6pJXdTXFpkBt1mB1PNfRfw=; b=fH4uiPhOK3WlXcUEO36zImldiMHE3fJCSwREw9tvpiZRc5JglVXuYigLqfAImcnHrJ0duwBit65pbTXdfF2FnL+mH2y3/NmsYQ9vdb8QuKefuWD//G9545f7TFjg6TnuYigaUwLbSf76/VlHCzgBuFD9esmiU+dBmYKoJuyiKws= 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 1616169515352275.58374879731423; Fri, 19 Mar 2021 08:58:35 -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-546-GOmSJxZNMwWNuP4dwJhE6Q-1; Fri, 19 Mar 2021 11:58:31 -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 1038F1083E83; Fri, 19 Mar 2021 15:58:26 +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 E048459446; Fri, 19 Mar 2021 15:58:25 +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 A133B1802140; Fri, 19 Mar 2021 15:58:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw6sl006321 for ; Fri, 19 Mar 2021 11:58:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 90DE91A353; Fri, 19 Mar 2021 15:58:06 +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 D44FD1A86F; Fri, 19 Mar 2021 15:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169514; 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=bfUzRKHHM0DdI3Z/W9dab6pJXdTXFpkBt1mB1PNfRfw=; b=LgM2XEwBSKZo3o6mnhHzb4b6BcAPJHLp8DY5WwHIjofecz6ky75NWq+VQYKSP/hjr6gOQf UPifnLFyqDHKCNswEzDVbI0QfQMQmJt+z6gSR8N/UDEMrmXRY6FW19tMAxaRBnNsMJR/ec 8cEBokD4WttZeJzdbPag692WjiFgJLg= X-MC-Unique: GOmSJxZNMwWNuP4dwJhE6Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 12/51] conf: Use virTristateXXX in virStorageAdapterFCHost Date: Fri, 19 Mar 2021 16:57:09 +0100 Message-Id: <20210319155748.680146-13-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 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 Reviewed-by: Michal Privoznik --- src/conf/storage_adapter_conf.c | 4 +++- src/conf/storage_adapter_conf.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_con= f.c index 77ecb8d5f2..69062b4b58 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -68,13 +68,15 @@ virStorageAdapterParseXMLFCHost(xmlNodePtr node, =20 fchost->parent =3D virXMLPropString(node, "parent"); if ((managed =3D virXMLPropString(node, "managed"))) { - if ((fchost->managed =3D virTristateBoolTypeFromString(managed)) <= 0) { + int value; + if ((value =3D virTristateBoolTypeFromString(managed)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown fc_host managed setting '%s'"), managed); VIR_FREE(managed); return -1; } + fchost->managed =3D value; } =20 fchost->parent_wwnn =3D virXMLPropString(node, "parent_wwnn"); diff --git a/src/conf/storage_adapter_conf.h b/src/conf/storage_adapter_con= f.h index 4c7da7c8d9..3f64cda9af 100644 --- a/src/conf/storage_adapter_conf.h +++ b/src/conf/storage_adapter_conf.h @@ -51,7 +51,7 @@ struct _virStorageAdapterFCHost { char *parent_fabric_wwn; char *wwnn; char *wwpn; - int managed; /* enum virTristateSwitch */ + virTristateBool managed; }; =20 typedef struct _virStorageAdapter virStorageAdapter; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169503; cv=none; d=zohomail.com; s=zohoarc; b=NDkIMntYMT2S/AIStvdrGMg4ZxkmWt/sF+zwqjnWJv223oZmCLJOM0kF3kEHW0hT5BXX2uvf4Glm4WxoBCAtQiW2gAo4A32LZb9RchuTKgMfEOum2Pf8tMxOlJZUzuQW5nmmR60R1gO1A2Wk6/RAoOhqH8B/vLfKn26FhgjL+Bo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169503; 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=F9SC28x3dqjFN2mbyWDq6HiJtPjIzNnmuQ/bLJ7oCr8=; b=TLsYF41WIQ7yG609d4pKMUkdw510Z2zRLSlqE+TIlhPsVb5oIvmOQi2qWjGzBjDCKlIX1Fhqoj2HnDOI18HeveEgprDqUXWf4z0bmjXcQH+Mbyw7DZdT8Tvn80/dqjI1B5Q7rzU3vQwhf5dHJV6rwNCGSXyF3E7NsgT48PNoSIA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169503243309.0211000270342; Fri, 19 Mar 2021 08:58:23 -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-192-pJw_S03wN72KhKhHgBvzmg-1; Fri, 19 Mar 2021 11:58:18 -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 B092F9CC02; Fri, 19 Mar 2021 15:58:12 +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 85F7A60871; Fri, 19 Mar 2021 15:58:12 +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 498DF180BADC; Fri, 19 Mar 2021 15:58:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFw7gF006328 for ; Fri, 19 Mar 2021 11:58:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id A0E4A1A353; Fri, 19 Mar 2021 15:58:07 +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 E59B416E3A; Fri, 19 Mar 2021 15:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169502; 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=F9SC28x3dqjFN2mbyWDq6HiJtPjIzNnmuQ/bLJ7oCr8=; b=Je3YjJt8xYuhxcg/28bY5iVJm3cMEZcGIr9m564Gvuxmpy9a0+VGsDOcvjclmHbjWldp9V 9eBH1UJCl/D3VXAgNV33g23ZChDnkLawmiIpZlKx6WiK6fIaT+MlGnnYgtXnrjWhKGXqkg JQ9eeAQi0rnkGOCLPpNTD+iiixg5d88= X-MC-Unique: pJw_S03wN72KhKhHgBvzmg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 13/51] conf: Use virTristateXXX in virStoragePoolSourceDevice Date: Fri, 19 Mar 2021 16:57:10 +0100 Message-Id: <20210319155748.680146-14-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/storage_conf.c | 7 ++++--- src/conf/storage_conf.h | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 2e07c81f8a..6116b04d44 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -617,14 +617,15 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, =20 partsep =3D virXMLPropString(nodeset[i], "part_separator"); if (partsep) { - dev.part_separator =3D virTristateBoolTypeFromString(partsep); - if (dev.part_separator <=3D 0) { + int value =3D virTristateBoolTypeFromString(partsep); + if (value <=3D 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("invalid part_separator setting '%s'"), partsep); virStoragePoolSourceDeviceClear(&dev); goto cleanup; } + dev.part_separator =3D value; } =20 if (VIR_APPEND_ELEMENT(source->devices, source->ndevice, dev) < 0)= { @@ -1097,7 +1098,7 @@ virStoragePoolSourceFormat(virBufferPtr buf, virBufferEscapeString(buf, "devices[i].path); if (src->devices[i].part_separator !=3D - VIR_TRISTATE_SWITCH_ABSENT) { + VIR_TRISTATE_BOOL_ABSENT) { virBufferAsprintf(buf, " part_separator=3D'%s'", virTristateBoolTypeToString(src->devices= [i].part_separator)); } diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 647eb847bf..8d417af7bb 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -168,7 +168,7 @@ struct _virStoragePoolSourceDevice { virStoragePoolSourceDeviceExtentPtr freeExtents; char *path; int format; /* Pool specific source format */ - int part_separator; /* enum virTristateSwitch */ + virTristateBool part_separator; =20 /* When the source device is a physical disk, * the geometry data is needed --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169510; cv=none; d=zohomail.com; s=zohoarc; b=g/2BlohU/wVjflkDD9P7yyRRL8yq6f8Ntj14O6rue1CaS0ApJbI5c5MaLGycC8A0lVk155HhtE7zKiDURhf2BqwtWWFOybnOFFKApOqGaQvdTV8Mc/jMZtHu+1W39YM75WeRwbuKtVKnyDOLIYznf7tEDjAXo9xHcs4Lqjr/3+A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169510; 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=2ZB/WEXZX+yC9aZdn+iJK3Hx0RqJYSjQ0g4Z1bhbLTg=; b=KcFL7HJpnSamAClvlbIwa6L+NxAWDPRAT2JphBtyyCnPZVV6OI9wHnx5au3HMINULN7wqLP0j1zieNjbJhb9uH8yQMzKY3v1N/AU/4ufgE3vZipyUDkvrOA85DSDd3U/IfHy/tEswE7oAlgPA5iitFBHc47GKv6tyTg9SAWDmK4= 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 161616951004543.76870036547814; Fri, 19 Mar 2021 08:58:30 -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-503-g7sRmQfsPLqnJOTmXTfoQQ-1; Fri, 19 Mar 2021 11:58:25 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F3EFE83DD33; Fri, 19 Mar 2021 15:58:15 +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 C5C3A1045EB9; Fri, 19 Mar 2021 15:58:15 +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 81B701802139; Fri, 19 Mar 2021 15:58:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwCMm006357 for ; Fri, 19 Mar 2021 11:58:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2999D1F048; Fri, 19 Mar 2021 15:58:12 +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 6E4DE16E3A; Fri, 19 Mar 2021 15:58:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169509; 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=2ZB/WEXZX+yC9aZdn+iJK3Hx0RqJYSjQ0g4Z1bhbLTg=; b=G1s95ej51MPkTSm+jw7LNX5bD97ORc00XhXOea1YDmFSl0IICtPg7byIMek1Iw4jMF406y vKdPcEKDZMlTU6WSjqsHkN+X3+wgEOen+eYe+w4I2nnT7eR+ILjgjKRRRwzGyHILoKWYsK 5UqBNtBIaWb2pVXwtiwW27/8TSRk8Pw= X-MC-Unique: g7sRmQfsPLqnJOTmXTfoQQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 14/51] conf: Use virTristateXXX in virPCIDeviceAddress Date: Fri, 19 Mar 2021 16:57:11 +0100 Message-Id: <20210319155748.680146-15-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/device_conf.c | 16 +++++++++------- src/util/virpci.h | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 714ac50762..0dd60985e9 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -246,13 +246,15 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, return -1; } =20 - if (multi && - ((addr->multi =3D virTristateSwitchTypeFromString(multi)) <=3D 0))= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown value '%s' for
'multifunction'= attribute"), - multi); - return -1; - + if (multi) { + int value; + if ((value =3D virTristateSwitchTypeFromString(multi)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unknown value '%s' for
'multifunct= ion' attribute"), + multi); + return -1; + } + addr->multi =3D value; } if (!virPCIDeviceAddressIsEmpty(addr) && !virPCIDeviceAddressIsValid(a= ddr, true)) return -1; diff --git a/src/util/virpci.h b/src/util/virpci.h index 9b37a12883..2c86642ea7 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -65,7 +65,7 @@ struct _virPCIDeviceAddress { unsigned int bus; unsigned int slot; unsigned int function; - int multi; /* virTristateSwitch */ + virTristateSwitch multi; int extFlags; /* enum virPCIDeviceAddressExtensionFlags */ virZPCIDeviceAddress zpci; /* Don't forget to update virPCIDeviceAddressCopy if needed. */ --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169519; cv=none; d=zohomail.com; s=zohoarc; b=UDH0AzC3qQJ9cTdHFwY6xbzGST47O3GlpSeDueFVbKrION4Pm8OOmiLak2iYDlhixviO+KD5ou4Uqt4fBAHJWB8ScwLlaOvRjQLkmeH7YhfvpWc4F3/cxTpHrRMjAdpHiVGhxxD6yPExR/wXqkAgjlW1XuiTg8GcWEdCRGPLaQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169519; 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=tKbAyfwdSslJ26cNZWe567GYdEtUxslg00G82p9opNM=; b=hxbnmnQlhsma3Vz8xW3jLlhfVkKkoG5wfLcaWvYaatsGQCD1Tnq+J7Qozj6N65ZWcimQaG495gTkyaadYwLo5EsVDM+QUhkpV3xIX9zLFZxeO+YLnJzzdHMfex65Mw0j6OCdEjoSLIS7rO8yFRfBFXRX27M36EM9PTxxYogv/04= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169519072219.03318404852064; Fri, 19 Mar 2021 08:58:39 -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-164-T4pgLluzPDeBBGqlYPamMg-1; Fri, 19 Mar 2021 11:58:35 -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 99F4F83DD25; Fri, 19 Mar 2021 15:58:29 +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 7685063B8C; Fri, 19 Mar 2021 15:58:29 +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 0AD2D4A713; Fri, 19 Mar 2021 15:58:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwGUO006389 for ; Fri, 19 Mar 2021 11:58:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1446E18E4B; Fri, 19 Mar 2021 15:58:16 +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 515D51C959; Fri, 19 Mar 2021 15:58:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169518; 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=tKbAyfwdSslJ26cNZWe567GYdEtUxslg00G82p9opNM=; b=gSj7+xzcNsqaQXdn1LWhPz8Dz5dQxxatF6dJl+cmyxWNWyVd6G5X1Q9i6EUxUF/vZaizkp f6zwopaxx/5T/2K4szuGb+HbLYPl7iXH+bgM7gXDnmp3aCuLE5ZmO12U+UwqBiflw1I35Q XgU9KFmWTqDI2MWEqCh0dI2mGsVDOBU= X-MC-Unique: T4pgLluzPDeBBGqlYPamMg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 15/51] virxml: Add virXMLPropTristateBool Date: Fri, 19 Mar 2021 16:57:12 +0100 Message-Id: <20210319155748.680146-16-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 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" Convenience function to return value of a yes / no attribute. Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/util/virxml.c | 41 ++++++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 5 +++++ 3 files changed, 47 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 526dcee11a..70525cef8c 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3545,6 +3545,7 @@ virXMLParseHelper; virXMLPickShellSafeComment; virXMLPropString; virXMLPropStringLimit; +virXMLPropTristateBool; virXMLSaveFile; virXMLValidateAgainstSchema; virXMLValidatorFree; diff --git a/src/util/virxml.c b/src/util/virxml.c index 4a6fe09468..81b7bb1386 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -558,6 +558,47 @@ virXMLNodeContentString(xmlNodePtr node) } =20 =20 +/** + * virXMLPropTristateBool: + * @node: XML dom node pointer + * @name: Name of the property (attribute) to get + * @required: Change the return value to -1 if the attribute is not present + * @result: The returned virTristateBool value + * + * Convenience function to return value of a yes / no attribute. + * + * Returns 1 in case of success in which case @value is set, + * or 0 if the attribute is not present, + * or -1 and reports an error on failure. + */ +int +virXMLPropTristateBool(xmlNodePtr node, const char* name, bool required, + virTristateBool *result) +{ + g_autofree char *tmp =3D virXMLPropString(node, name); + int val; + + if (!tmp) { + if (!required) + return 0; + virReportError(VIR_ERR_XML_ERROR, + _("Missing required attribute '%s' in element '%s'"= ), + name, node->name); + return -1; + } + + if ((val =3D virTristateBoolTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid value for attribute '%s' in element '%s'= : '%s'. Expected 'yes' or 'no'"), + name, node->name, tmp); + return -1; + } + + *result =3D val; + return 1; +} + + /** * virXPathBoolean: * @xpath: the XPath string to evaluate diff --git a/src/util/virxml.h b/src/util/virxml.h index d32f77b867..3041c37df3 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -28,6 +28,7 @@ #include =20 #include "virbuffer.h" +#include "virenum.h" =20 xmlXPathContextPtr virXMLXPathContextNew(xmlDocPtr xml) G_GNUC_WARN_UNUSED_RESULT; @@ -77,6 +78,10 @@ char * virXMLPropStringLimit(xmlNodePtr node, const char *name, size_t maxlen); char * virXMLNodeContentString(xmlNodePtr node); +int virXMLPropTristateBool(xmlNodePtr node, + const char *name, + bool mandatory, + virTristateBool *result); =20 /* Internal function; prefer the macros below. */ xmlDocPtr virXMLParseHelper(int domcode, --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169667; cv=none; d=zohomail.com; s=zohoarc; b=jVLH6skfqI0yqPnoaMqm3ixroyppBtzfbuG8hhWAtmfqA4LaZU8EG2+3tWMlncN45aBpa4jOTiNoT2OXoFCCxWoHSyaxZM45628Nycph6s7AEVMh7q39yGB5YUbtc9wRA68P5WU+pl7kbOpTZ5tvQ2AFzWEezbmoazpHUXKIG8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169667; 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=tKqzkzRBnGo1pPZ1rUEUc939w1VB9gX1vudv0wQzteg=; b=gqYHuD4lXOwn7VWhmewBS2Diuwxz4P89QDIQpnnRRsoEprXo42ZyaRcFgIsupgGuidNcVNZ5WLF8yNieSe/E1faFgqqv5xqARUgTqCxXK+Ni0AW0c/Ptg1RyrlAO1WGtb1oF3ouQnPr+fHmNDYPOL0G7B6ePipTXftW/dvN15nY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169667727177.13504175484695; Fri, 19 Mar 2021 09:01:07 -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-26-knIEoro_M1isrv3PSELFiw-1; Fri, 19 Mar 2021 11:58:39 -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 E689987A83A; Fri, 19 Mar 2021 15:58:33 +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 A85FF60871; Fri, 19 Mar 2021 15:58:33 +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 500B54A71B; Fri, 19 Mar 2021 15:58:33 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwHwi006412 for ; Fri, 19 Mar 2021 11:58:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 25C771C959; Fri, 19 Mar 2021 15:58:17 +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 692B718E4B; Fri, 19 Mar 2021 15:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169665; 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=tKqzkzRBnGo1pPZ1rUEUc939w1VB9gX1vudv0wQzteg=; b=Lo5LUAOVNyMdt4w9/GEi4CBGeHOjkPOwLYHetHqvovC1yEUfraVjUUa551Eix8OUL1PDoa LcFhG+TNbrfyUHZZOhq+DqJE7tWaLJH9czJ3JOB2HP+jR2wOZDaXYTM2MnK85Guz7+yZae C8ESLvqKj8V9Jy6/ccJEOeluEz8fnvE= X-MC-Unique: knIEoro_M1isrv3PSELFiw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 16/51] virxml: Add virXMLPropTristateSwitch Date: Fri, 19 Mar 2021 16:57:13 +0100 Message-Id: <20210319155748.680146-17-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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" Convenience function to return value of an on / off attribute. Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/libvirt_private.syms | 1 + src/util/virxml.c | 41 ++++++++++++++++++++++++++++++++++++++++ src/util/virxml.h | 6 +++++- 3 files changed, 47 insertions(+), 1 deletion(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 70525cef8c..9aed890c58 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -3546,6 +3546,7 @@ virXMLPickShellSafeComment; virXMLPropString; virXMLPropStringLimit; virXMLPropTristateBool; +virXMLPropTristateSwitch; virXMLSaveFile; virXMLValidateAgainstSchema; virXMLValidatorFree; diff --git a/src/util/virxml.c b/src/util/virxml.c index 81b7bb1386..aaad6453d2 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -599,6 +599,47 @@ virXMLPropTristateBool(xmlNodePtr node, const char* na= me, bool required, } =20 =20 +/** + * virXMLPropTristateSwitch: + * @node: XML dom node pointer + * @name: Name of the property (attribute) to get + * @required: Change the return value to -1 if the attribute is not present + * @result: The returned virTristateSwitch value + * + * Convenience function to return value of an on / off attribute. + * + * Returns 1 in case of success in which case @value is set, + * or 0 if the attribute is not present, + * or -1 and reports an error on failure. + */ +int +virXMLPropTristateSwitch(xmlNodePtr node, const char* name, bool required, + virTristateSwitch *result) +{ + g_autofree char *tmp =3D virXMLPropString(node, name); + int val; + + if (!tmp) { + if (!required) + return 0; + virReportError(VIR_ERR_XML_ERROR, + _("Missing required attribute '%s' in element '%s'"= ), + name, node->name); + return -1; + } + + if ((val =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid value for attribute '%s' in element '%s'= : '%s'. Expected 'on' or 'off'"), + name, node->name, tmp); + return -1; + } + + *result =3D val; + return 1; +} + + /** * virXPathBoolean: * @xpath: the XPath string to evaluate diff --git a/src/util/virxml.h b/src/util/virxml.h index 3041c37df3..e844cb0713 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -80,8 +80,12 @@ char * virXMLPropStringLimit(xmlNodePtr node, char * virXMLNodeContentString(xmlNodePtr node); int virXMLPropTristateBool(xmlNodePtr node, const char *name, - bool mandatory, + bool required, virTristateBool *result); +int virXMLPropTristateSwitch(xmlNodePtr node, + const char *name, + bool required, + virTristateSwitch *result); =20 /* Internal function; prefer the macros below. */ xmlDocPtr virXMLParseHelper(int domcode, --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169514; cv=none; d=zohomail.com; s=zohoarc; b=bPhUUUZDdkW5qmebsVNteappT/gvGSqTZrvsHzkw/j9UwWt+PZxh/IayZqpMvElbaShkQdPt/rU2pW6n9gwqwiYeRo083dAG2JZsxBvhGgVv6nigv5H9QW68wjnTUqWbK5j1yF2nLjdilMXl+qDIim8R8IQT/rKrFbUT6T05Mb4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169514; 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=D+kBGP2zEW8+Y1SfZihEHEVln1OKFgG6RIK/KNge4uw=; b=ANFAZMiILgvJZO6bSYvFbjdDGNn0ptyzDSQQcIyZ6gPjt25xVLSTnDW+x7QAOPkXul5XA0kdKP8b7B96SpGHQW2geP72s9RTCYnjBjrIkE7SWV8KA2r4IA3COZ2QDdwX5cDkIFr3DYObWkzQD3d2XbbYZ9ou2ca+SaHnH01Ja/I= 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 1616169514162682.9378201335649; Fri, 19 Mar 2021 08:58:34 -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-490-1siUtGwuMR-t-0Cvp3R0uw-1; Fri, 19 Mar 2021 11:58:30 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CCC93185FFCE; Fri, 19 Mar 2021 15:58:24 +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 A5C6D10013D6; Fri, 19 Mar 2021 15:58:24 +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 67ABD180213E; Fri, 19 Mar 2021 15:58:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwIE7006426 for ; Fri, 19 Mar 2021 11:58:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 367D11C947; Fri, 19 Mar 2021 15:58:18 +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 792FE1A86F; Fri, 19 Mar 2021 15:58:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169512; 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=D+kBGP2zEW8+Y1SfZihEHEVln1OKFgG6RIK/KNge4uw=; b=MskcChlT944T+ClwrC9q9WyOQcWHvGKOuDGhckVx6OTdIIoKxCq3UZQG7yXXH4w/yLtCCD xJ53KjadUBTo2Xzvf08eTCjMARpuxTp+aRtnbw/D93AYfbnjRrSUctNTqZ/pfu3XRjIEdc 1SeN/GrzeHoLy0aU52z0UNaSoWWbD6w= X-MC-Unique: 1siUtGwuMR-t-0Cvp3R0uw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 17/51] domain_conf: Use virXMLPropTristateXXX in virDomainKeyWrapCipherDefParseXML Date: Fri, 19 Mar 2021 16:57:14 +0100 Message-Id: <20210319155748.680146-18-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9e106b8846..7dfbca12e5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1447,10 +1447,9 @@ static int virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDefPtr keywrap, xmlNodePtr node) { - int state_type; + virTristateSwitch state_type =3D VIR_TRISTATE_SWITCH_ABSENT; int name_type; g_autofree char *name =3D NULL; - g_autofree char *state =3D NULL; =20 if (!(name =3D virXMLPropString(node, "name"))) { virReportError(VIR_ERR_CONF_SYNTAX, "%s", @@ -1464,17 +1463,8 @@ virDomainKeyWrapCipherDefParseXML(virDomainKeyWrapDe= fPtr keywrap, return -1; } =20 - if (!(state =3D virXMLPropString(node, "state"))) { - virReportError(VIR_ERR_CONF_SYNTAX, - _("missing state for cipher named %s"), name); - return -1; - } - - if ((state_type =3D virTristateSwitchTypeFromString(state)) < 0) { - virReportError(VIR_ERR_CONF_SYNTAX, - _("%s is not a supported cipher state"), state); + if (virXMLPropTristateSwitch(node, "state", true, &state_type) < 0) return -1; - } =20 switch ((virDomainKeyWrapCipherName) name_type) { case VIR_DOMAIN_KEY_WRAP_CIPHER_NAME_AES: --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169613; cv=none; d=zohomail.com; s=zohoarc; b=B5A4MCmDm7UF9zzRPCyFwCtRz6G1c5PNeUBEqTkLKrjfBTk80KSDuRdqdFiczduIgACL6dOziSiJrn81kHiLj1ExdUw6UQ/TrTizLNgYzzmMtn7Baz4ZBSWILIe20Y7gFNWno/BkbrLHdFjjuJeRAtFu3k0UmDruAr3CZQLxpAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169613; 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=om2H2emwl6e9FmIPhTvV+UV/myX4W454DI8KKMTATYk=; b=nI0KLxLwYfrG4RGeuNQnKhZ2N2LlFYa0cW4BNmhehVSuqm7APuhdnlJljkqrZdsdkfJV2KRzvN6kkAgDZ/i8CgtBFcOi0tFLC+ajpl9EbtdNHaOjgTGRH6D3az+440bVXcK5vC7abqMf2v1++RjOFVCXVCwCJeS+5P8h/RWwjeQ= 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 1616169612472263.8270601596229; Fri, 19 Mar 2021 09:00:12 -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-51-3MtEnCW3MdKuYra2fjDbTg-1; Fri, 19 Mar 2021 11:58:44 -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 AF18A1083E96; Fri, 19 Mar 2021 15:58: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 8B2D85D9F2; Fri, 19 Mar 2021 15:58: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 4E282180214B; Fri, 19 Mar 2021 15:58:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwJu7006439 for ; Fri, 19 Mar 2021 11:58:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4761D1C947; Fri, 19 Mar 2021 15:58:19 +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 89BE01A86F; Fri, 19 Mar 2021 15:58:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169610; 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=om2H2emwl6e9FmIPhTvV+UV/myX4W454DI8KKMTATYk=; b=MWoN1FenA6uE4QBuwrGmNtsVPwI4+09L7Cxaalh6hs3AUzLnMkywd/Ojg2oJENXYsHyTQH 2S6Rjtd3CRuVm/RGQn04mwvaHuFwcxlAlYvDgvzndmfWl3Q72bxcpG5ME9raO390ocgpit 5abnJLHv2kqeFIXISXjYLsQHsltcNUo= X-MC-Unique: 3MtEnCW3MdKuYra2fjDbTg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 18/51] domain_conf: Use virXMLPropTristateXXX in virDomainVirtioOptionsParseXML Date: Fri, 19 Mar 2021 16:57:15 +0100 Message-Id: <20210319155748.680146-19-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.14 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 34 ++++++---------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7dfbca12e5..6997b7d743 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1591,9 +1591,7 @@ static int virDomainVirtioOptionsParseXML(xmlNodePtr driver, virDomainVirtioOptionsPtr *virtio) { - int val; virDomainVirtioOptionsPtr res; - g_autofree char *str =3D NULL; =20 if (*virtio || !driver) return 0; @@ -1602,34 +1600,14 @@ virDomainVirtioOptionsParseXML(xmlNodePtr driver, =20 res =3D *virtio; =20 - if ((str =3D virXMLPropString(driver, "iommu"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid iommu value")); - return -1; - } - res->iommu =3D val; - } - VIR_FREE(str); + if (virXMLPropTristateSwitch(driver, "iommu", false, &res->iommu) < 0) + return -1; =20 - if ((str =3D virXMLPropString(driver, "ats"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid ats value")); - return -1; - } - res->ats =3D val; - } - VIR_FREE(str); + if (virXMLPropTristateSwitch(driver, "ats", false, &res->ats) < 0) + return -1; =20 - if ((str =3D virXMLPropString(driver, "packed"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid packed value")); - return -1; - } - res->packed =3D val; - } + if (virXMLPropTristateSwitch(driver, "packed", false, &res->packed) < = 0) + return -1; =20 return 0; } --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169530; cv=none; d=zohomail.com; s=zohoarc; b=MopsXQHw/XTvN0lYopwpKkJCbrEFvQm12aYAsn0ZhHFNh3nnHJXNGFIf8rx1qBUoRfZiLKymqPQSsLLYuZNni16jhRBgVOcv02LwE6eEOG9w+qciXEAayXQwzCH0htPyPLh0fcSIxmTQfXkJlObatXB0SK6vA407DEf8El8x02I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169530; 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=hJCL+bv53kQkIBT7w4ljKM6h6kRDQdRkv/G+u8d5Ioc=; b=UewMdJ8Y8ESuHwTYhBuNDCwlZGRJMVoH6VF5+oXFwFzJr+MfzNSP2/c00rWNE1Gf94KYy0ITTbc8w9jRSqS+w9XpoU4DbpTZj4Gsa7Y+SXGuYrAp/UrBghwAwoK5NU1lWVa2dFB+rCbWaxjjSBG3sSRVPzsVRw/fvoSa5LgWdMs= 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 161616953022637.502593650773974; Fri, 19 Mar 2021 08:58:50 -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-434-dzqpY2AvM1m0jmrGvT5xWg-1; Fri, 19 Mar 2021 11:58:46 -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 25F031083E83; Fri, 19 Mar 2021 15:58:41 +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 EFB385D9F2; Fri, 19 Mar 2021 15:58:40 +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 B28FF4A71E; Fri, 19 Mar 2021 15:58:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwKJw006470 for ; Fri, 19 Mar 2021 11:58:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5527B1C947; Fri, 19 Mar 2021 15:58:20 +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 9B47E1A86F; Fri, 19 Mar 2021 15:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169529; 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=hJCL+bv53kQkIBT7w4ljKM6h6kRDQdRkv/G+u8d5Ioc=; b=Kkg16V2nNIRxvCNIUqOLhILYS+POlPMS0TkUO+ZgQCIvVNv0UvC74eY4CgPGOD7rOAPehQ U/j6KPdoJ/Gkv1FaVxRDL8mdbD9PQ81AYN7KefybbrdcfQdZ1weUUNv00GKP+9KD47uycv r0AhZAZ7WrhD4m8hr99wAYwym/OgVZ4= X-MC-Unique: dzqpY2AvM1m0jmrGvT5xWg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 19/51] domain_conf: Use virXMLPropTristateXXX in virDomainDeviceInfoParseXML Date: Fri, 19 Mar 2021 16:57:16 +0100 Message-Id: <20210319155748.680146-20-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.14 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6997b7d743..920078a706 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6620,8 +6620,6 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xml= opt, xmlNodePtr boot =3D NULL; xmlNodePtr rom =3D NULL; int ret =3D -1; - g_autofree char *romenabled =3D NULL; - g_autofree char *rombar =3D NULL; g_autofree char *aliasStr =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 @@ -6649,24 +6647,12 @@ virDomainDeviceInfoParseXML(virDomainXMLOptionPtr x= mlopt, =20 if ((flags & VIR_DOMAIN_DEF_PARSE_ALLOW_ROM) && (rom =3D virXPathNode("./rom", ctxt))) { - if ((romenabled =3D virXPathString("string(./rom/@enabled)", ctxt)= )) { - int value; - if ((value =3D virTristateBoolTypeFromString(romenabled)) <=3D= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown rom enabled value '%s'"), romena= bled); - goto cleanup; - } - info->romenabled =3D value; - } - if ((rombar =3D virXPathString("string(./rom/@bar)", ctxt))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(rombar)) <=3D 0= ) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown rom bar value '%s'"), rombar); - goto cleanup; - } - info->rombar =3D value; - } + if (virXMLPropTristateBool(rom, "enabled", false, &info->romenable= d) < 0) + goto cleanup; + + if (virXMLPropTristateSwitch(rom, "bar", false, &info->rombar) < 0) + goto cleanup; + info->romfile =3D virXMLPropString(rom, "file"); =20 if (info->romenabled =3D=3D VIR_TRISTATE_BOOL_NO && --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169609; cv=none; d=zohomail.com; s=zohoarc; b=Jq/2m0FpLeB53G0/U75stgc75XHybqRWt4jFUTRiISQHMg7/dkALgZ7dOw1ClQDhvyxesSjm5LvrPfLtrty8aZm3UsTSPASCbkrIIs5FDyeXg4Wx0AQwAGfj6fzo+zVVZV+RnSe3Me4Od4S7IlN2hsurqv4jJINrt/ZF2rRoC0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169609; 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=6NT1cvqVEI+vp7krOp2EdaOkT7UoRW/f5QvUyGr4nLY=; b=T/96vINx4KP5fop3XhxRLSMPX+hXiic4QvB/k8NMsPm+YZHPSBUJ4LcnA6zI+bJ3hzsfMMHXDbpGshZhuSh0PKTP2PKAgdIQqyKJiYaPZ4RHKM85lwIwi0H4Fqp2QBLFt72YGNUT1AGGeDFsSGp61Hnju+fWfnZXMprgUJp42bA= 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 1616169609236723.6155719150615; Fri, 19 Mar 2021 09:00:09 -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-603-W-Wrh1IHP8Kw69nnTyeuhQ-1; Fri, 19 Mar 2021 11:58:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 217E383DD2C; Fri, 19 Mar 2021 15:58:28 +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 EFB16505AF; Fri, 19 Mar 2021 15:58: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 A8C294A70F; Fri, 19 Mar 2021 15:58:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwLFl006483 for ; Fri, 19 Mar 2021 11:58:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6E56B18E4B; Fri, 19 Mar 2021 15:58:21 +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 AD5761A86F; Fri, 19 Mar 2021 15:58:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169607; 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=6NT1cvqVEI+vp7krOp2EdaOkT7UoRW/f5QvUyGr4nLY=; b=RxMTL72Ns9yMVO/s9KXF2Fsns1ZspznXgoIikB/rHbS3sHvAONCymGwl5tH5TC1JNSZE5w UvcAo+2T3q1ByYJVYnl1SGRQMgvAuKZDfm79DX9b14FPn8XN8xEf4wTQ+bB5Bev8jP8n+2 jUHTMMmL65460dmCpkCrERXwGHjCf1c= X-MC-Unique: W-Wrh1IHP8Kw69nnTyeuhQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 20/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNetworkParse Date: Fri, 19 Mar 2021 16:57:17 +0100 Message-Id: <20210319155748.680146-21-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.12 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 920078a706..4fd4fabb3f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8274,7 +8274,6 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, { int tlsCfgVal; g_autofree char *protocol =3D NULL; - g_autofree char *haveTLS =3D NULL; g_autofree char *tlsCfg =3D NULL; g_autofree char *sslverifystr =3D NULL; xmlNodePtr tmpnode; @@ -8298,16 +8297,8 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, return -1; } =20 - if ((haveTLS =3D virXMLPropString(node, "tls"))) { - int value; - - if ((value =3D virTristateBoolTypeFromString(haveTLS)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown disk source 'tls' setting '%s'"), ha= veTLS); - return -1; - } - src->haveTLS =3D value; - } + if (virXMLPropTristateBool(node, "tls", false, &src->haveTLS) < 0) + return -1; =20 if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && (tlsCfg =3D virXMLPropString(node, "tlsFromConfig"))) { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169629; cv=none; d=zohomail.com; s=zohoarc; b=SkchB/eQtVls8AUL63Itb1cuv3ra86peBbLIcxggBPZwi1be4WwBa3v0AI4Wd3TIWX3lQ6JLFM52aKNUbyzcctSwuZ1Bsp5xm66/CNLTyI2dZdjgR2WBTJa4NwjuO42FZUb4DUAcpvLfYlGOviDC4Y7Q1ERUFScEFRHekjg/jFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169629; 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=cgEkvjgOmZIKy4NKOJgc5eFJKZuouM0x8aKXPA9p9qU=; b=MyQLf5Em6sEh4mZewCTcS7D1diZRyz1EJIg/NXlYOhYreJQyoqZ9+ytO/pfJ8Ua9iecPN5wkBHL5nV4RG0tbHEtsS9Bb9zuMfIExQUGG4lm4qLMkXLYoa5X25Li8RZE8CgSxH4ZukiX9HYWwZqNR5sAurdIA/OsSWvnyXQCURss= 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 1616169629154740.3103957360047; Fri, 19 Mar 2021 09:00:29 -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-357-JmUK1LNlO4mUUACxPvYZ0Q-1; Fri, 19 Mar 2021 11:58:37 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 76CBF83DD2A; Fri, 19 Mar 2021 15:58:31 +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 51325104254E; Fri, 19 Mar 2021 15:58:31 +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 111FD4A718; Fri, 19 Mar 2021 15:58:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwMcC006507 for ; Fri, 19 Mar 2021 11:58:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7AD3B1C959; Fri, 19 Mar 2021 15:58:22 +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 C1A991A86F; Fri, 19 Mar 2021 15:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169626; 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=cgEkvjgOmZIKy4NKOJgc5eFJKZuouM0x8aKXPA9p9qU=; b=aHM1Oe/ZOdw+RqFRC7P6lBMSYcZS77TwNzdYfkTG3nZUc6f7C1xz7QjEAToSZKahLuKpnz d2/iPjEdQAM5WaoS57vT1DcMxQIC7uXn8LDuj3e+MXFbRRqG3JUewYZn8jRtGu80d9gXhx +y4l1a5Qfoc8CeEBmJGrK5AXKnTYL2g= X-MC-Unique: JmUK1LNlO4mUUACxPvYZ0Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 21/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNVMeParse Date: Fri, 19 Mar 2021 16:57:18 +0100 Message-Id: <20210319155748.680146-22-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4fd4fabb3f..f2fb3c8dd5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8397,7 +8397,6 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, g_autoptr(virStorageSourceNVMeDef) nvme =3D NULL; g_autofree char *type =3D NULL; g_autofree char *namespc =3D NULL; - g_autofree char *managed =3D NULL; xmlNodePtr address; =20 nvme =3D g_new0(virStorageSourceNVMeDef, 1); @@ -8428,16 +8427,8 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, return -1; } =20 - if ((managed =3D virXMLPropString(node, "managed"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(managed)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("malformed managed value '%s'"), - managed); - return -1; - } - nvme->managed =3D value; - } + if (virXMLPropTristateBool(node, "managed", false, &nvme->managed) < 0) + return -1; =20 if (!(address =3D virXPathNode("./address", ctxt))) { virReportError(VIR_ERR_XML_ERROR, "%s", --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169526; cv=none; d=zohomail.com; s=zohoarc; b=BY35VQxEjrmRv9D8aaA4rbg7kLM27ViU0QFXaeqtY8QEq/7vOIqhjiakmJz1ZjmkNQdMlEKkZ+v2zEV0XmAuceLwy9fjjq43od6gWFW/xhTIa8IIhDTpgbSHeOZOBZL49y+I2P3iW1/RFO4BFTWxEdx+FZJWJoOEIfRa5p8jGLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169526; 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=9evOtfMPPN8dsoGI7HNc2Dor95KIITjbvEnwAXtv2JI=; b=lj1Y6dOFu3MSo3dmcsO3VDQQZfNjMdhpKdtKdsQLnAbEGIEwYQINoG1eS+DwC28PSJTzx8jXyzoxyamv7tXcE6vdOoWwPeXfgm38HKOfqpME/Z9gNxA6hw32rdnSyTyX+Lrn97qqR98I3cx/m3J/7h/eOfuzXtW3tiPHXYoGd0Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169526051826.8128051109454; Fri, 19 Mar 2021 08:58:46 -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-94-wSMJgclgPtGMiBeO4_BeDw-1; Fri, 19 Mar 2021 11:58:42 -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 E942383DD31; Fri, 19 Mar 2021 15:58:36 +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 C53275D9F2; Fri, 19 Mar 2021 15:58: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 87E2C1802146; Fri, 19 Mar 2021 15:58:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwRtD006588 for ; Fri, 19 Mar 2021 11:58:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1FD8C1A86F; Fri, 19 Mar 2021 15:58:27 +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 5DE9918E4B; Fri, 19 Mar 2021 15:58:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169525; 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=9evOtfMPPN8dsoGI7HNc2Dor95KIITjbvEnwAXtv2JI=; b=etahmJOYUC6+gJMx8eo4UrcCFa3sw4nfKM2LlSla0AUdAKQksV2lhEZGcmeJ1NNo335DH7 GkrR8sKQ4wi1MQ77gnWGN9GcRbWBaUYtz1ADVq5WmgYK103wq/sRiL1nGi6rG1sQwen9oF SCLU2IQB2sTVEYbnqfbaVTRFaPtL5HI= X-MC-Unique: wSMJgclgPtGMiBeO4_BeDw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 22/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskDefDriverParseXML Date: Fri, 19 Mar 2021 16:57:19 +0100 Message-Id: <20210319155748.680146-23-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.14 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f2fb3c8dd5..f17c979e31 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9132,38 +9132,14 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr = def, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "ioeventfd"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk ioeventfd mode '%s'"), tmp); - return -1; - } - def->ioeventfd =3D value; - } - VIR_FREE(tmp); + if (virXMLPropTristateSwitch(cur, "ioeventfd", false, &def->ioeventfd)= < 0) + return -1; =20 - if ((tmp =3D virXMLPropString(cur, "event_idx"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk event_idx mode '%s'"), tmp); - return -1; - } - def->event_idx =3D value; - } - VIR_FREE(tmp); + if (virXMLPropTristateSwitch(cur, "event_idx", false, &def->event_idx)= < 0) + return -1; =20 - if ((tmp =3D virXMLPropString(cur, "copy_on_read"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk copy_on_read mode '%s'"), tmp); - return -1; - } - def->copy_on_read =3D value; - } - VIR_FREE(tmp); + if (virXMLPropTristateSwitch(cur, "copy_on_read", false, &def->copy_on= _read) < 0) + return -1; =20 if ((tmp =3D virXMLPropString(cur, "discard")) && (def->discard =3D virDomainDiskDiscardTypeFromString(tmp)) <=3D 0)= { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169530; cv=none; d=zohomail.com; s=zohoarc; b=NIOtZbZxu5ZKf+l2U6JHxNWjAKoOWF1ZIz+fd4ySbdR+Jh2wkbjPFOdFBn40vtj8+wyDlhnbq06NvFXAa3NVjyIxkms2VmpXI8p1i40YQdOaWJsOayGkVQyWPOi36ZbDvctVR+0rmxJDBdguLb/WRhu80f7agyPl2V+4BZRc2t8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169530; 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=1OnsWABS1TnNnZ2QhDBJWYrCEBRU6AZXQAVf3gNhKzU=; b=NSclp4znontLBfDJZBywnItEzPxpZwcM8pYhj/D5xTLoEVLPNhAEjO+zbxA6yaMxaKLPXzdUhhvwVH+JB7V8HBX2mmW8hyPKJF+7ZLeFPsLNJhVPI0/kGKo1hJCvQ62mwBSmNg29fW3mfiBCECv0M7Yps3LY5zzD+LwdoX4YW+I= 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 1616169530631233.42021785881684; Fri, 19 Mar 2021 08:58:50 -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-593-BifBuylBOgizk5NiuFKfnA-1; Fri, 19 Mar 2021 11:58:47 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 670EB9CC1B; Fri, 19 Mar 2021 15:58:40 +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 36F306B8E5; Fri, 19 Mar 2021 15:58:40 +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 E516E4A707; Fri, 19 Mar 2021 15:58:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwVoP006635 for ; Fri, 19 Mar 2021 11:58:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC66918E4B; Fri, 19 Mar 2021 15:58:31 +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 110331C94B; Fri, 19 Mar 2021 15:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169529; 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=1OnsWABS1TnNnZ2QhDBJWYrCEBRU6AZXQAVf3gNhKzU=; b=Vf1jcSfZ+tB2y5xt3kD9olyuk6Hqca6LCSERnCPRrpJ6rLBXlxBh92+JZyj3L97/Dd33hM MKuWaOvPffyxFrkBFq5jRHUhtQczEdlb1Z/BAUjr/UDu7W5qDO/UlEuEejdvsE89cDJs9L Js5NArCjwnMsPZ3iZiOHLHd8iz2l3TQ= X-MC-Unique: BifBuylBOgizk5NiuFKfnA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 23/51] domain_conf: Use virXMLPropTristateXXX in virDomainActualNetDefParseXML Date: Fri, 19 Mar 2021 16:57:20 +0100 Message-Id: <20210319155748.680146-24-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.16 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f17c979e31..6a43fb2588 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10435,7 +10435,6 @@ virDomainActualNetDefParseXML(xmlNodePtr node, g_autofree char *type =3D NULL; g_autofree char *mode =3D NULL; g_autofree char *addrtype =3D NULL; - g_autofree char *trustGuestRxFilters =3D NULL; g_autofree char *macTableManager =3D NULL; =20 actual =3D g_new0(virDomainActualNetDef, 1); @@ -10463,16 +10462,9 @@ virDomainActualNetDefParseXML(xmlNodePtr node, goto error; } =20 - if ((trustGuestRxFilters =3D virXMLPropString(node, "trustGuestRxFilte= rs"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(trustGuestRxFilters))= <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown trustGuestRxFilters value '%s'"), - trustGuestRxFilters); - goto error; - } - actual->trustGuestRxFilters =3D value; - } + if (virXMLPropTristateBool(node, "trustGuestRxFilters", false, + &actual->trustGuestRxFilters) < 0) + goto error; =20 virtPortNode =3D virXPathNode("./virtualport", ctxt); if (virtPortNode) { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169526; cv=none; d=zohomail.com; s=zohoarc; b=CuW5wAxQva78pptl3fi/iRg0vHc4Plu5+3eaSLXdUprBza2tdzjOwUg6pFQ/9GkUJ/T9QeJbbK+D/7RyIuFErOXUELjKeC839r9Du4CS0zcabTfArEH0hUPkHqMi0Bzob4y2pkMKc7nQNmihWUZvQmWN7R0REfRGw1RldC2vqWs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169526; 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=XOmIWMldUYrWaosy/R+Kg758jagOkxpUdhbhlcR2Uwk=; b=gKFTKaNZOYTWbfFH7TFkzeCOvaZKxlTwcvC97m4t0/6yo2NuHaf4CdYa3Bx3Bdg8rs1n2UMmKGV0WhW1ZgH/XzNkd5zefqbi80qrdiMh7MoecMGLRfhdeeySiZmS+iy0QNfgyTY0jTvCr/yIVcwDuE5smxlc9ElEmc6pQxNXiTM= 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 1616169526704295.3676402321937; Fri, 19 Mar 2021 08:58:46 -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-509-CseoFw31NgK7BT-v3UlK6w-1; Fri, 19 Mar 2021 11:58:43 -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 841D683DD2B; Fri, 19 Mar 2021 15:58:35 +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 5E7132915E; Fri, 19 Mar 2021 15:58:35 +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 1E9A91802143; Fri, 19 Mar 2021 15:58:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwWTm006649 for ; Fri, 19 Mar 2021 11:58:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id D0C3C18E4B; Fri, 19 Mar 2021 15:58:32 +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 1F0D41A353; Fri, 19 Mar 2021 15:58:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169525; 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=XOmIWMldUYrWaosy/R+Kg758jagOkxpUdhbhlcR2Uwk=; b=iPQx/TjY8l3GJJzbi5gQg7qFLgC0/i8sK6RmX0PZFvTZ9omUSERP8blL3heDGhNNvtuJKG PpAQsB9QXY/vzFeEcNNwb4Hx+zqimUsDXIO0ehq7yTMRHQNqoTimG92ynSu12K5MS9d1TL FfRjBRt1CN+aVYw9vlYhvumjbzuWOxw= X-MC-Unique: CseoFw31NgK7BT-v3UlK6w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 24/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceReconnectDefParseXML Date: Fri, 19 Mar 2021 16:57:21 +0100 Message-Id: <20210319155748.680146-25-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.14 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6a43fb2588..7e17ded2a1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10618,7 +10618,6 @@ virDomainChrSourceReconnectDefParseXML(virDomainChr= SourceReconnectDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - int tmpVal; VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr cur; g_autofree char *tmp =3D NULL; @@ -10626,16 +10625,8 @@ virDomainChrSourceReconnectDefParseXML(virDomainCh= rSourceReconnectDefPtr def, ctxt->node =3D node; =20 if ((cur =3D virXPathNode("./reconnect", ctxt))) { - if ((tmp =3D virXMLPropString(cur, "enabled"))) { - if ((tmpVal =3D virTristateBoolTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid reconnect enabled value: '%s'"), - tmp); - return -1; - } - def->enabled =3D tmpVal; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(cur, "enabled", false, &def->enabled) <= 0) + return -1; =20 if (def->enabled =3D=3D VIR_TRISTATE_BOOL_YES) { if ((tmp =3D virXMLPropString(cur, "timeout"))) { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169688; cv=none; d=zohomail.com; s=zohoarc; b=D+KIafFih73uTC4aUNDgNh93DbeJ6zFaSL0mZTb93IwNitRdThBLLm7XX+HrKU0zEBLTQxu+Gz5oby/U9N0GSbqHVAzufCsiv9ho5r9Duzq6loCa2uZhyffqWVi+av/GhUwXLc1Yve9RlskpuM94nlKH/V1GNkz9Vg+RX/zo1jE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169688; 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=WZMvb8HkKI2updCJ1vCRGvf5C7D4aoM9rle21vzN1bU=; b=NZeSVtBvzJC7NHfy2tA54cwRiM3vi/CuHkniJWOC5OM7ADzrSqzClrm7+jpWbRW8VRhFAYJ1uqbLFcFU7vtD6jo+PfLy9DHs9XeF8hlk1N6ldeLV6fm6OFWO7IxnrBc80P3LfNfZhpzlKi6R34CHRBkdbaxVGI9c7alcmcJAi5k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169687248912.5625986086952; Fri, 19 Mar 2021 09:01:27 -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-303-ekILWZ8wN9-AcvvvV4zySQ-1; Fri, 19 Mar 2021 11:58:50 -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 51C33108BD07; Fri, 19 Mar 2021 15:58:44 +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 28B2719CBC; Fri, 19 Mar 2021 15:58:44 +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 CFBF5180C5AA; Fri, 19 Mar 2021 15:58:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwXW0006666 for ; Fri, 19 Mar 2021 11:58:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id E1CD61A86F; Fri, 19 Mar 2021 15:58:33 +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 3078918E4B; Fri, 19 Mar 2021 15:58:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169683; 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=WZMvb8HkKI2updCJ1vCRGvf5C7D4aoM9rle21vzN1bU=; b=PKSZUbmpGks3zyD185TGSn1jo8Jtqfa2EBAoHcNdrRDyjo/EBLAInZOlHL7WUgoNCHng49 rImKoIcrNgUUbmh1VWlFhJcRiNycZzgDJomw1RXW7R7r/36uhYaU+0PETWKT5gE52J98xT voiAAIxyAuaRH7ZdvTiL9ZD04nlsnxg= X-MC-Unique: ekILWZ8wN9-AcvvvV4zySQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 25/51] domain_conf: Use virXMLPropTristateXXX in virDomainNetDefParseXML Date: Fri, 19 Mar 2021 16:57:22 +0100 Message-Id: <20210319155748.680146-26-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 180 +++++++++++------------------------------ 1 file changed, 49 insertions(+), 131 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7e17ded2a1..97eb1b6f8a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10719,7 +10719,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, g_autofree char *queues =3D NULL; g_autofree char *rx_queue_size =3D NULL; g_autofree char *tx_queue_size =3D NULL; - g_autofree char *str =3D NULL; g_autofree char *filter =3D NULL; g_autofree char *internal =3D NULL; g_autofree char *mode =3D NULL; @@ -10729,7 +10728,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, g_autofree char *vhostuser_mode =3D NULL; g_autofree char *vhostuser_path =3D NULL; g_autofree char *vhostuser_type =3D NULL; - g_autofree char *trustGuestRxFilters =3D NULL; g_autofree char *vhost_path =3D NULL; const char *prefix =3D xmlopt ? xmlopt->config.netPrefix : NULL; =20 @@ -10749,16 +10747,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlo= pt, def->type =3D VIR_DOMAIN_NET_TYPE_USER; } =20 - if ((trustGuestRxFilters =3D virXMLPropString(node, "trustGuestRxFilte= rs"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(trustGuestRxFilters))= <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown trustGuestRxFilters value '%s'"), - trustGuestRxFilters); - goto error; - } - def->trustGuestRxFilters =3D value; - } + if (virXMLPropTristateBool(node, "trustGuestRxFilters", false, + &def->trustGuestRxFilters) < 0) + goto error; =20 cur =3D node->children; while (cur !=3D NULL) { @@ -11328,128 +11319,55 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xm= lopt, } =20 if ((tmpNode =3D virXPathNode("./driver/host", ctxt))) { - if ((str =3D virXMLPropString(tmpNode, "csum"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host csum mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.csum =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "gso"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host gso mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.gso =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "tso4"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host tso4 mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.tso4 =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "tso6"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host tso6 mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.tso6 =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "ecn"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host ecn mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.ecn =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "ufo"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host ufo mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.ufo =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "mrg_rxbuf"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown host mrg_rxbuf mode '%s'"), - str); - goto error; - } - def->driver.virtio.host.mrg_rxbuf =3D val; - } - VIR_FREE(str); + if (virXMLPropTristateSwitch(tmpNode, "csum", false, + &def->driver.virtio.host.csum) < = 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "gso", false, + &def->driver.virtio.host.gso) < 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "tso4", false, + &def->driver.virtio.host.tso4) < = 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "tso6", false, + &def->driver.virtio.host.tso6) < = 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "ecn", false, + &def->driver.virtio.host.ecn) < 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "ufo", false, + &def->driver.virtio.host.ufo) < 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "mrg_rxbuf", false, + &def->driver.virtio.host.mrg_rxbu= f) < 0) + goto error; } =20 if ((tmpNode =3D virXPathNode("./driver/guest", ctxt))) { - if ((str =3D virXMLPropString(tmpNode, "csum"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest csum mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.csum =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "tso4"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest tso4 mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.tso4 =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "tso6"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest tso6 mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.tso6 =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "ecn"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest ecn mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.ecn =3D val; - } - VIR_FREE(str); - if ((str =3D virXMLPropString(tmpNode, "ufo"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown guest ufo mode '%s'"), - str); - goto error; - } - def->driver.virtio.guest.ufo =3D val; - } + if (virXMLPropTristateSwitch(tmpNode, "csum", false, + &def->driver.virtio.guest.csum) <= 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "tso4", false, + &def->driver.virtio.guest.tso4) <= 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "tso6", false, + &def->driver.virtio.guest.tso6) <= 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "ecn", false, + &def->driver.virtio.guest.ecn) < = 0) + goto error; + + if (virXMLPropTristateSwitch(tmpNode, "ufo", false, + &def->driver.virtio.guest.ufo) < = 0) + goto error; } def->backend.vhost =3D g_steal_pointer(&vhost_path); } --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169550; cv=none; d=zohomail.com; s=zohoarc; b=VPaUIy/gqZIfAVurka2Ey+b1GjMpOqk7UFaacj5u6SVJOl7zZuBXd7Yxp8Lq/lQryANfovuC6W/ZII4p2I99VPDBB2pxcsbEq4+1jhOOWrAfp3NiAr7NJSSkmSIY12S0ad1uKEos7s+/Uy8y0jCso805C2hZ8mlhyKIO25b5+Uo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169550; 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=82G9U+1ssunEPIIGUegxJ753/dJoFSR6DFI0d8LHJRU=; b=JhedDrNP8jOprQP2Y/7hNfzqRP53ID5ifuwCQm9nv/myjL8atI/NjwPhzDQvGZCgr+eBkcfjqQHxidaHgO9FUWGQpPSRxR32X1SquVRFUf7eyFKNsVLubKsp2kh8bayAQZKRXFVPwXtB8vqCtW7nx+88nNQ9kaq8IaVUfB9inxg= 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 161616955065637.616873780086394; Fri, 19 Mar 2021 08:59:10 -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-417-g2PNNeSHOZWTOoLjRRpDbA-1; Fri, 19 Mar 2021 11:58:46 -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 A2253185FFC9; Fri, 19 Mar 2021 15:58:39 +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 757861F045; Fri, 19 Mar 2021 15:58:39 +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 0E048180214D; Fri, 19 Mar 2021 15:58:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwZVm006685 for ; Fri, 19 Mar 2021 11:58:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id F25991A353; Fri, 19 Mar 2021 15:58:34 +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 3FC1618E4B; Fri, 19 Mar 2021 15:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169549; 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=82G9U+1ssunEPIIGUegxJ753/dJoFSR6DFI0d8LHJRU=; b=HtYIc2ozIwUbXC5PyNMv2WsIHBK9xzQjbCYQ2Ta6v90qIq/+BlcjBCtCU23Tt/a+FYbH6/ /fXBqFyD6K4P42Sdw9mCtPgAvhevSy6fFQnFxrDixdPUPiZ1GtAiGRB3jARA2uffKSUy/5 vNM3LUfzF4yhU/fiDpon6lg9C6iyCFo= X-MC-Unique: g2PNNeSHOZWTOoLjRRpDbA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 26/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseTCP Date: Fri, 19 Mar 2021 16:57:23 +0100 Message-Id: <20210319155748.680146-27-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 97eb1b6f8a..7fb096e6d9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11703,17 +11703,8 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDe= fPtr def, def->data.tcp.host =3D virXMLPropString(source, "host"); def->data.tcp.service =3D virXMLPropString(source, "service"); =20 - if ((tmp =3D virXMLPropString(source, "tls"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown chardev 'tls' setting '%s'"), - tmp); - return -1; - } - def->data.tcp.haveTLS =3D value; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(source, "tls", false, &def->data.tcp.haveTL= S) < 0) + return -1; =20 if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && (tmp =3D virXMLPropString(source, "tlsFromConfig"))) { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169533; cv=none; d=zohomail.com; s=zohoarc; b=GPvAeKoMPObUxBYpKvSfwUPDCqpY4q+P+39G80YfJFfpdR/z3j9vsy+wVievQmmmr2GlpOJqJRAEUzO9JZ1bMuKC3Kma6yL9e3+MWQemFoAFkFj45I4eH3wZ9uEmvZJHa+tPMNR8T77hHyns+2HZA4vaOZVpG+glG6I4usRsFMM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169533; 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=zuyn0oRzHLdV9PV2/z+3vgSL1iRI8Vfz8UN9yJKArnQ=; b=hi/qbsAafV8aB3raQ5dmtd6LJef5fo2ZlR2J2w+U9m/TRVPD36JOcpdvN+fCgZ7zvAX5jrO95uH3z6IdL++MjTpsPC1+WvujKx9lkVc9n+PdGgrG88GfDqno3ynFcuurVFPgeG+dqd2GG/v3WKOJ+z8jhaID2j969+Lpx/+AT44= 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 1616169533374852.1453420583698; Fri, 19 Mar 2021 08:58:53 -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-233-XGKqJGJAP5aeOayIIuQZfw-1; Fri, 19 Mar 2021 11:58:50 -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 7FFE0108BD14; Fri, 19 Mar 2021 15:58:43 +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 4E65F1F045; Fri, 19 Mar 2021 15:58:43 +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 0704750039; Fri, 19 Mar 2021 15:58:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwalc006704 for ; Fri, 19 Mar 2021 11:58:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0DEA81A353; Fri, 19 Mar 2021 15:58:36 +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 50F031A86F; Fri, 19 Mar 2021 15:58:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169532; 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=zuyn0oRzHLdV9PV2/z+3vgSL1iRI8Vfz8UN9yJKArnQ=; b=ek5P3PaylkxeZR0shj/TYWOQCEPy0ApYGmpT3JsalKWu9S1HzrIoRu8GaSYqMjKhO+9o7c IcWUvTkYT2L24QSogWIWuQTKnXpIGpfRWRCK22u/AgnMVSWhutQtaz+C+VB4EsVi74ea2h TNHeExaBprx7zvu/sDZWMK+GJld0YZg= X-MC-Unique: XGKqJGJAP5aeOayIIuQZfw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 27/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseFile Date: Fri, 19 Mar 2021 16:57:24 +0100 Message-Id: <20210319155748.680146-28-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7fb096e6d9..0f3be88235 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11777,20 +11777,11 @@ static int virDomainChrSourceDefParseFile(virDomainChrSourceDefPtr def, xmlNodePtr source) { - g_autofree char *append =3D NULL; - def->data.file.path =3D virXMLPropString(source, "path"); =20 - if ((append =3D virXMLPropString(source, "append"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(append)) <=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), - append); - return -1; - } - def->data.file.append =3D value; - } + if (virXMLPropTristateSwitch(source, "append", false, + &def->data.file.append) < 0) + return -1; =20 return 0; } --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169665; cv=none; d=zohomail.com; s=zohoarc; b=FT1IGhFuVQQiL1KZHSD2Nk7vbcifcwucKm+By52b05Gva7d4DG4qoYsF1C3yCvytuUKXD+0IskhYx2P12QInUDt+kw+woV3KTRPyL6VbdtPYPIKvKbjLHZzFuxGPfQoLFwj5f56Dmb35Nm4Z0XoSXfoZyqk/zPb30n6g+i1cr+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169665; 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=Ogm5zX5GTF0RLB3CYF6MNNzj2UfAJKlerhMzJ1XoWOY=; b=mKguUGA3mHmOH4s60GJ9pod9vfMtCJUw7+ehlgKF9/4kOvamWDdDmTBMz0MogGlOSNL/hshSL1/C+fxruTZ/2h+3fnA0aCvoUkxcD2SJdUAgnUhUpDSBGtQYJnPus2Ts0VwG6JMK8Ye1xfvivFnQg9vwGKRBXjuClHx5VLA66II= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169665775757.1477279408455; Fri, 19 Mar 2021 09:01:05 -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-122-7kS6_l34OfOuo4Ty6GzOxA-1; Fri, 19 Mar 2021 11:58:53 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0A3E9CC07; Fri, 19 Mar 2021 15:58:46 +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 8BCD760BF1; Fri, 19 Mar 2021 15:58:46 +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 4C5051818464; Fri, 19 Mar 2021 15:58:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwbE7006711 for ; Fri, 19 Mar 2021 11:58:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1D57518E4B; Fri, 19 Mar 2021 15:58:37 +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 60D981A353; Fri, 19 Mar 2021 15:58:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169663; 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=Ogm5zX5GTF0RLB3CYF6MNNzj2UfAJKlerhMzJ1XoWOY=; b=G46L6WK5ScLPpucCOs0NCmp2d0QvW9rkvO8bMeFjrkv0FbYJRwS8eOHhkz7lfA3Qpgiz4s iLDuo3ZO4ALrXieVeqaV7wh0tw6eMT6rgAB8lnxDSZyQmJIFGbeTxO+ZHLpd/IZpmkOsH9 7fj0oipmPI6gwDj6U7dZdeBqtDYOpnk= X-MC-Unique: 7kS6_l34OfOuo4Ty6GzOxA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 28/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseLog Date: Fri, 19 Mar 2021 16:57:25 +0100 Message-Id: <20210319155748.680146-29-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.12 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0f3be88235..842a134220 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11812,20 +11812,10 @@ static int virDomainChrSourceDefParseLog(virDomainChrSourceDefPtr def, xmlNodePtr log) { - g_autofree char *append =3D NULL; - def->logfile =3D virXMLPropString(log, "file"); =20 - if ((append =3D virXMLPropString(log, "append"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(append)) <=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), - append); - return -1; - } - def->logappend =3D value; - } + if (virXMLPropTristateSwitch(log, "append", false, &def->logappend) < = 0) + return -1; =20 return 0; } --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169610; cv=none; d=zohomail.com; s=zohoarc; b=ZneQSOScZjokVUK1/4+RDViR0TDiX/6mvmRvZG+mQen0KfocdZxUzpNQwoGTYpJOS6qbYyGOpXpvIB8cUWmIuIxbnxyNt34oseymUXKzDPJ6iQ5toTTv57/UNEEw9LQ610JznWTKKVTRtVWslrEzvO5MN0B+958skXeiRzJweLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169610; 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=vKQMnCs+/QMvybX5FY9s2n8c8FA2PK9BnhR9ewhx5jk=; b=WSdI2dkHoZr9I/0WIyyWszLorZ2YOZXLIDX1x234wqITq4qiniRYQVInWd6pIS/VXQl+EiJUy8bM9kI3Lm1uzn/puT8Bof+5ur0SpWr/ZZCZx830LZlRKvhbJYCOrzoYeOEY1EvHwpilcZgffhHPMLKv0ayQV1dZXgkLButgouI= 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 1616169610650907.2135566066423; Fri, 19 Mar 2021 09:00:10 -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-291-hz3T4pkuNtSxDtLlrNbdkA-1; Fri, 19 Mar 2021 11:58:57 -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 118BA185FFDA; Fri, 19 Mar 2021 15:58:50 +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 DEED819CBC; Fri, 19 Mar 2021 15:58:49 +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 9F5E51818468; Fri, 19 Mar 2021 15:58:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwc7a006732 for ; Fri, 19 Mar 2021 11:58:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 296EC18E4B; Fri, 19 Mar 2021 15:58:38 +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 71CB81A353; Fri, 19 Mar 2021 15:58:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169608; 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=vKQMnCs+/QMvybX5FY9s2n8c8FA2PK9BnhR9ewhx5jk=; b=Ld/UMRHAU+remlWKUI1X6fH4ie2+Zpyddy36Pc4XnZy2q0uyVCQXgQdMH9KOJYZtUQGKc2 eDBJKLz1jiPBzJl97DSsuLMTVfNb4x1Ms15VFC7IZ2ZamISP1JhgD8A+iNm8j10VhIiXpN YqTvA+Fdnu0LJwj7+Ki7cf5ANIo3KgI= X-MC-Unique: hz3T4pkuNtSxDtLlrNbdkA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 29/51] domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLVNC Date: Fri, 19 Mar 2021 16:57:26 +0100 Message-Id: <20210319155748.680146-30-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.11 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 842a134220..35320fe1e5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13043,7 +13043,6 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsDe= fPtr def, g_autofree char *websocketGenerated =3D virXMLPropString(node, "websoc= ketGenerated"); g_autofree char *sharePolicy =3D virXMLPropString(node, "sharePolicy"); g_autofree char *autoport =3D virXMLPropString(node, "autoport"); - g_autofree char *powerControl =3D virXMLPropString(node, "powerControl= "); xmlNodePtr audioNode; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 @@ -13102,15 +13101,9 @@ virDomainGraphicsDefParseXMLVNC(virDomainGraphicsD= efPtr def, } } =20 - if (powerControl) { - int powerControlVal =3D virTristateBoolTypeFromString(powerControl= ); - if (powerControlVal < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("cannot parse vnc power control '%s'"), power= Control); - return -1; - } - def->data.vnc.powerControl =3D powerControlVal; - } + if ((virXMLPropTristateBool(node, "powerControl", false, + &def->data.vnc.powerControl)) < 0) + return -1; =20 def->data.vnc.keymap =3D virXMLPropString(node, "keymap"); =20 --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169677; cv=none; d=zohomail.com; s=zohoarc; b=OZSSByjzEJVQihdl2LX2sIyxjiryM1ZRaZ89Ponoys1FEfIHj9vRdVr9EAI09AZzcbWAi4vUUb+wVtiNCBvnXOIHu8/AzJ7/v8L/ioyDaSpRw0lhyj+cx6pOfJfV8QXq/hvZln+ZT4BycuyXIpkt1cJmzY5LahKCF9Iyul3toMk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169677; 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=Jv69mbraS9ReCUeLNg5Pp7xzAAFGUwe3XKLfqtvSNBQ=; b=PpYvna4QjMoKeH7KUpj0niHujiycvrhUKMau0pfocaxlM3Wi2yzg6fe/BwKuG+zWRb5ziWMYmA/h+AmhTtIJrq0Bu2iNBpSK5HdFjbpcaPy3zzSmUMiK0iX+9jFwTQjKMeAx84zgjLATmwvTao39twTRqDGY93bn9c4n4YZqkSA= 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 1616169677758970.1462696255742; Fri, 19 Mar 2021 09:01:17 -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-83-MVh8GPsZMv2aY9iauQcb0w-1; Fri, 19 Mar 2021 11:59:00 -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 AD1599CC03; Fri, 19 Mar 2021 15:58:54 +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 7F3251C94B; Fri, 19 Mar 2021 15:58:54 +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 3D8885003C; Fri, 19 Mar 2021 15:58:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFwqZK006885 for ; Fri, 19 Mar 2021 11:58:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8418918E4B; Fri, 19 Mar 2021 15:58:52 +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 2296E1C955; Fri, 19 Mar 2021 15:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169675; 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=Jv69mbraS9ReCUeLNg5Pp7xzAAFGUwe3XKLfqtvSNBQ=; b=Y9qRrSJh6lLcxNfS7P79zcNr0kaq1q8VwZdJ3D2lyC0kz9NZxxHobssnCgCFLOXXn6fPim v1YDCifN3yK1yzs0vxbFxqpW4lNYMi3hPlaTcduGeNrboMJbPYnDHDBGSBDLvzkzvHEgqw vqiFh/w/wzjELTiGQtSuC9tf4C7M7n4= X-MC-Unique: MVh8GPsZMv2aY9iauQcb0w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 30/51] domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSDL Date: Fri, 19 Mar 2021 16:57:27 +0100 Message-Id: <20210319155748.680146-31-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 35320fe1e5..4684496522 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13139,10 +13139,8 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphicsD= efPtr def, xmlXPathContextPtr ctxt) { VIR_XPATH_NODE_AUTORESTORE(ctxt) - int enableVal; xmlNodePtr glNode; g_autofree char *fullscreen =3D virXMLPropString(node, "fullscreen"); - g_autofree char *enable =3D NULL; =20 ctxt->node =3D node; =20 @@ -13161,20 +13159,14 @@ virDomainGraphicsDefParseXMLSDL(virDomainGraphics= DefPtr def, =20 glNode =3D virXPathNode("./gl", ctxt); if (glNode) { - enable =3D virXMLPropString(glNode, "enable"); - if (!enable) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("sdl gl element missing enable")); + if (virXMLPropTristateBool(glNode, "enable", false, &def->data.sdl= .gl) < 0) return -1; - } =20 - enableVal =3D virTristateBoolTypeFromString(enable); - if (enableVal < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown enable value '%s'"), enable); + if (def->data.sdl.gl =3D=3D VIR_TRISTATE_BOOL_ABSENT) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("sdl gl element missing enable")); return -1; } - def->data.sdl.gl =3D enableVal; } =20 return 0; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169675; cv=none; d=zohomail.com; s=zohoarc; b=NFIOb9Y8F+1qKmBoHhBJRhVOVUiX2MSxyqnpZH/z4a4RDUQtpNTbsefRlOdFHAwdK9ps+lUg+XBDp7k22ko6/Ul/g00+3l2emWpu+cuwwMEEDKQqlyjeOSDSuTKr0gBzdhCR1cUkX6wGlLfu8q4pa+WCbkcUypyNl0lJmFAbhNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169675; 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=wkasNKu0Yv2l6tsDvt/ZI/4S5s8/xlfsWFm0XGmNO28=; b=Xnf+htQaDZv0gSIC1rEIT3a5pA55xFScddRxSv9sHP35IzZCuu7oYktR+giASHeIglOeAfgQQZqOzTkVQEVtMjylrEODIpeXgFqqKxd6aXUXU1bENMFMS1qYlphcY4WboSRvyVqyWvwxGbh0bYQZ2SHrIRdauPCTL85/jut/gic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169675451218.71520635490685; Fri, 19 Mar 2021 09:01:15 -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-190-dwnZGaB4NISaYyapbwtObA-1; Fri, 19 Mar 2021 11:59:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75A561083E80; Fri, 19 Mar 2021 15:59:06 +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 510C961141; Fri, 19 Mar 2021 15:59:06 +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 D713A5003E; Fri, 19 Mar 2021 15:59:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFx4pY007124 for ; Fri, 19 Mar 2021 11:59:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id A101518E4B; Fri, 19 Mar 2021 15:59:04 +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 856071F40A; Fri, 19 Mar 2021 15:58:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169673; 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=wkasNKu0Yv2l6tsDvt/ZI/4S5s8/xlfsWFm0XGmNO28=; b=AUOAd3EiC41jYA4czt7vW/aH7gXZXSoNNouMV5fxh6yrZc0AzhBgdr13qKyTl3jZpOfjdP fqBRxU53co7gWWIoGa9yarI1eaynL1X+QhYv1eqSiydtRogJqcEzcOolt/GUxjjAYExZDS nV+TQETaJihUd/dR3CSEPyZJ7HqrtwQ= X-MC-Unique: dwnZGaB4NISaYyapbwtObA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 31/51] domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSpice Date: Fri, 19 Mar 2021 16:57:28 +0100 Message-Id: <20210319155748.680146-32-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.12 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 75 ++++++------------------------------------ 1 file changed, 10 insertions(+), 65 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4684496522..d78d09a4b9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13396,23 +13396,10 @@ 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"); - - if (!compression) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("spice playback missing compression")= ); - return -1; - } - - if ((compressionVal =3D - virTristateSwitchTypeFromString(compression)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unknown spice playback compression")= ); + if (virXMLPropTristateSwitch(cur, "compression", true, + &def->data.spice.playback) < = 0) return -1; - } =20 - def->data.spice.playback =3D compressionVal; } else if (virXMLNodeNameEqual(cur, "streaming")) { int modeVal; g_autofree char *mode =3D virXMLPropString(cur, "mode"); @@ -13431,62 +13418,20 @@ 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 (!copypaste) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("spice clipboard missing copypaste")); + if (virXMLPropTristateBool(cur, "copypaste", true, + &def->data.spice.copypaste) < 0) 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 (!enable) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("spice filetransfer missing enable")); + if (virXMLPropTristateBool(cur, "enable", true, + &def->data.spice.filetransfer) = < 0) return -1; - } - - if ((enableVal =3D - virTristateBoolTypeFromString(enable)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown enable value '%s'"), enable); - 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"); + def->data.spice.rendernode =3D virXMLPropString(cur, + "rendernode"= ); =20 - if (!enable) { - 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); + if (virXMLPropTristateBool(cur, "enable", true, + &def->data.spice.gl) < 0) 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 From nobody Mon Apr 29 09:07:11 2024 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=1616169565; cv=none; d=zohomail.com; s=zohoarc; b=Xu0fobEOdj5J8Lxze5fjfyBqxHl8Rx2gncbxQGMiBQxVj3ZJuDFslCpfvUm/poc5nWFsst4Ep5lA7IBnAEfXWdJi0A70CT0TiV2qWJ33/p0JBHuAyefGOrRy71kWKoknuAFidRC/turkEUcm9/1DBiM9lZOy7gq1OqIqc4Fz68k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169565; 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=oKl5l/67bDRZbL5+ZXVr9XddkUHE9L9O5f3lkpmT1Vo=; b=S6ktG7ynNvneRhBfiwsz9Ufj524MtQOpSbRRUURGDQxRHjnvijP4askBqT9LlxXDJFvQhx5fTtSHzYHDuSX6dAfmsR68w8ozkmAbXvgeuw3v5QjJi9E5TebjXyXOwMyrcyOmX7tatM7jIlFatmmb8CjxU1dZ6tpAQHYd62qxmzM= 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 1616169565411520.1492021573306; Fri, 19 Mar 2021 08:59:25 -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-338-LErpy-AjM9OdV98pWzSJ1Q-1; Fri, 19 Mar 2021 11:59:19 -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 89181185FFCF; Fri, 19 Mar 2021 15:59:14 +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 5C1621A353; Fri, 19 Mar 2021 15:59:14 +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 119D250041; Fri, 19 Mar 2021 15:59:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFxCk9007208 for ; Fri, 19 Mar 2021 11:59:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id DCB141F048; Fri, 19 Mar 2021 15:59:12 +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 8EB2C1F04C; Fri, 19 Mar 2021 15:59:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169564; 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=oKl5l/67bDRZbL5+ZXVr9XddkUHE9L9O5f3lkpmT1Vo=; b=h0xctBpmF1MOZQGuFoH6zINPXvxryPp016+XZnLlkeP3kV13Lh3JW95mOD6ehopLShknJT +km9Bf9BpYjgxn503v6KGCaDXu7ujF/0+/amupYXnJJHbHkFxQyD7jl5hqDheyKMPm7oDd mqNsYEGYopeGbAF7v/sN7CvpSYI4NAo= X-MC-Unique: LErpy-AjM9OdV98pWzSJ1Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 32/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioCommonParse Date: Fri, 19 Mar 2021 16:57:29 +0100 Message-Id: <20210319155748.680146-33-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d78d09a4b9..dff554874f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13716,8 +13716,6 @@ virDomainAudioCommonParse(virDomainAudioIOCommonPtr= def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - g_autofree char *mixingEngine =3D virXMLPropString(node, "mixingEngine= "); - g_autofree char *fixedSettings =3D virXMLPropString(node, "fixedSettin= gs"); g_autofree char *voices =3D virXMLPropString(node, "voices"); g_autofree char *bufferLength =3D virXMLPropString(node, "bufferLength= "); xmlNodePtr settings; @@ -13726,21 +13724,11 @@ virDomainAudioCommonParse(virDomainAudioIOCommonP= tr def, ctxt->node =3D node; settings =3D virXPathNode("./settings", ctxt); =20 - if (mixingEngine && - ((def->mixingEngine =3D - virTristateBoolTypeFromString(mixingEngine)) <=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'mixingEngine' value '%s'"), mixingEngin= e); + if (virXMLPropTristateBool(node, "mixingEngine", false, &def->mixingEn= gine) < 0) return -1; - } =20 - if (fixedSettings && - ((def->fixedSettings =3D - virTristateBoolTypeFromString(fixedSettings)) <=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'fixedSettings' value '%s'"), fixedSetti= ngs); + if (virXMLPropTristateBool(node, "fixedSettings", false, &def->fixedSe= ttings) < 0) return -1; - } =20 if (def->fixedSettings =3D=3D VIR_TRISTATE_BOOL_YES && def->mixingEngine !=3D VIR_TRISTATE_BOOL_YES) { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169570; cv=none; d=zohomail.com; s=zohoarc; b=HSN2ehVuQWTVB2BEqb3QOWXi/2PpQZSLB9rWmHOVWKMqV9sztSCj2XDzmRH7OchbMCq9rblz2aNbFRU5E8Ypd+UL0FyrmdmYBb1bXdqJNqmfz/VT/rL0D7fp1jIieDExKmLM9Phi4omgIvbMF+YeYeP5ayS8kWM4qgmpOgsHREQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169570; 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=IzEzTVuCTRo9bgiNb8dskXg84kKiZCfPzfjyZmX8Fhs=; b=Rt+/rb+bmOMvADTQDWLuZ1lvPAKfyXLciavx59VeLREaD98PjSELR29sgBmBA+8+mgwhcOrgZZQ6ZjK6ALCtdiUi9l5CkrrVN1hzmZ5682qzZqlV/t070QvQt+D1rextDVNNm4KomNuMGsIQWjrPwtJpd52bqB1u5SMf5FQPzKQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169570547751.7797024730711; Fri, 19 Mar 2021 08:59:30 -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-176-sjQvP34ENk66qpHVhUYEQQ-1; Fri, 19 Mar 2021 11:59:27 -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 E978883DD23; Fri, 19 Mar 2021 15:59:21 +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 C655660C23; Fri, 19 Mar 2021 15:59:21 +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 85CF6180B450; Fri, 19 Mar 2021 15:59:21 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFxJVI007284 for ; Fri, 19 Mar 2021 11:59:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id B32C71C947; Fri, 19 Mar 2021 15:59:19 +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 AB30C18E4B; Fri, 19 Mar 2021 15:59:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169569; 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=IzEzTVuCTRo9bgiNb8dskXg84kKiZCfPzfjyZmX8Fhs=; b=a3jEW+J0fxmWhMgGw9JMok1h+zc5HspNTkiCc7bXMnszgjF2c9rR8ueDmPJEFCtOApwxo2 FLhK1mHjC0v+AdL/a4Ur1Kjs8rjf/8/yCwgfdcvmzoxQHWb1upW5GlsSbGHUDvhK2CSpEx PP8VcuntNwxtPgphpnufHop8RKeGOvk= X-MC-Unique: sjQvP34ENk66qpHVhUYEQQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 33/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioJackParse Date: Fri, 19 Mar 2021 16:57:30 +0100 Message-Id: <20210319155748.680146-34-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.14 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dff554874f..afd37e3e49 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13822,19 +13822,12 @@ static int virDomainAudioJackParse(virDomainAudioIOJackPtr def, xmlNodePtr node) { - g_autofree char *exactName =3D virXMLPropString(node, "exactName"); - def->serverName =3D virXMLPropString(node, "serverName"); def->clientName =3D virXMLPropString(node, "clientName"); def->connectPorts =3D virXMLPropString(node, "connectPorts"); =20 - if (exactName && - ((def->exactName =3D - virTristateBoolTypeFromString(exactName)) <=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'exactName' value '%s'"), exactName); + if (virXMLPropTristateBool(node, "exactName", false, &def->exactName) = < 0) return -1; - } =20 return 0; } --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169615; cv=none; d=zohomail.com; s=zohoarc; b=dC1ZY8QbcV2/GkEdxYNoEYWFx3FUJWBkDM/B71NBfqsHB4nHa+TmskGWPtjBS8AoKir/2MVeEevbBLyeN8KvF0cSSOgyXuNESOxbhCbakhnXeN6DAGtS5l7KeYCp281FPmHxZQXdcCC/RVN2UahBGgFJ8h8RXeIwtC5VVs1nYCo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169615; 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=4ZIhwIXcV0U4q0B/y6raTkQOlmx/yqo1rpu1qOlWwck=; b=EELmmqzL3skOMyg4BEIU5KsENumyalYBplu/pEmcb2LdVV7JGzDhbDIZVbjLjxgufiUHdIE7jCm7UI0KsYaHCLUi5MWbBMc1g4POuKxfhs99yrn9CH61O04Py4mboI1odpyMswfYG9Bs6+32D4J0ivQUTK/1B4m4L3zN2Vh/ykk= 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 1616169615199256.32491909114754; Fri, 19 Mar 2021 09:00:15 -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-105-FUum3AtyO5q4ayQgXEjDrA-1; Fri, 19 Mar 2021 12:00:09 -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 9B3F11085945; Fri, 19 Mar 2021 16:00:01 +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 E679B1F40A; Fri, 19 Mar 2021 16:00:00 +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 98AF350039; Fri, 19 Mar 2021 16:00:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JFxxEN007414 for ; Fri, 19 Mar 2021 11:59:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id DE4102B3CB; Fri, 19 Mar 2021 15:59:58 +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 A139C1F433; Fri, 19 Mar 2021 15:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169613; 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=4ZIhwIXcV0U4q0B/y6raTkQOlmx/yqo1rpu1qOlWwck=; b=XoJuRAG698ViDDRazpzoH14vSxKvN1MBBHDNF/aEMccqec5b2+uQOg86H8UeK/NymvnxOw JiQMURgDRxye0NJI2PiUk7HoNAYEJonIfx2COC9c4ZBqigCZGMkRR+AJm/jcp1fMkFX6Wp 05S5xs3Sqs/DsoJesJLq39rC1TUbv0Q= X-MC-Unique: FUum3AtyO5q4ayQgXEjDrA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 34/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioOSSParse Date: Fri, 19 Mar 2021 16:57:31 +0100 Message-Id: <20210319155748.680146-35-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index afd37e3e49..c341091c99 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13837,18 +13837,12 @@ static int virDomainAudioOSSParse(virDomainAudioIOOSSPtr def, xmlNodePtr node) { - g_autofree char *tryPoll =3D virXMLPropString(node, "tryPoll"); g_autofree char *bufferCount =3D virXMLPropString(node, "bufferCount"); =20 def->dev =3D virXMLPropString(node, "dev"); =20 - if (tryPoll && - ((def->tryPoll =3D - virTristateBoolTypeFromString(tryPoll)) <=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'tryPoll' value '%s'"), tryPoll); + if (virXMLPropTristateBool(node, "tryPoll", false, &def->tryPoll) < 0) return -1; - } =20 if (bufferCount && virStrToLong_ui(bufferCount, NULL, 10, --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169627; cv=none; d=zohomail.com; s=zohoarc; b=CxSFfnb7Zf+y94sv5mPU8/FPAABfTYRCOMb48VW+4nUPWW+SmRF6QDf1oticWFt+zovDbgA9ElggT3hjNd79q9BCuqzNIRBAm/dPUaa3Pq0HYo1CLQokKDHTTXSq0MBbXhX6Pdq5tZuGVeWj890red4YpIeWPiTGq/7iS72FQ+4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169627; 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=ebQhWOHzz/NPwujarZYsl8oTfkAaUyMasGWZgmn4JD4=; b=JKl0ibtjeDP3yNDcpW4MYzwUx/1nyrRaghLpP7SSMFtST7VGgantWDH6a8XDXFkPFn9WHmMjVxJRSWBrbkAgjA0YcaredwbfNF/UDnWeZXGeWon+yx6/fCllqzK1WqO9QjiNtudZXvPjN0qorC4rbthw1GRBSSWOFQlMd+LUYEI= 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 1616169627274876.0766330823518; Fri, 19 Mar 2021 09:00:27 -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-190-IygDSpwtNZ6Zr0xiy2A2cA-1; Fri, 19 Mar 2021 12:00:14 -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 EF0C457086; Fri, 19 Mar 2021 16:00:06 +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 B6F4B5D740; Fri, 19 Mar 2021 16:00:06 +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 5D86750038; Fri, 19 Mar 2021 16:00:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG00f1007423 for ; Fri, 19 Mar 2021 12:00:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id 56EA91F40A; Fri, 19 Mar 2021 16:00:00 +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 31A971F445; Fri, 19 Mar 2021 15:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169624; 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=ebQhWOHzz/NPwujarZYsl8oTfkAaUyMasGWZgmn4JD4=; b=IQsawVUIu2sKEMss9cO0tcv5//88r0Lk0j5z56ZfacmrvdIqxLVLDHM5vyNKn29SJFouln M+uLIB6d2tr3qzowN7JDEy3e3wD7uEa4THisDfW/IE8bQQ1rPrWgU3IPCtoZb13l400hWo ISXzKIbBDWuUVTDEC0Bv8VlA31dFUPo= X-MC-Unique: IygDSpwtNZ6Zr0xiy2A2cA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 35/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioDefParseXML Date: Fri, 19 Mar 2021 16:57:32 +0100 Message-Id: <20210319155748.680146-36-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c341091c99..0b5d8e5164 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13969,23 +13969,15 @@ virDomainAudioDefParseXML(virDomainXMLOptionPtr x= mlopt G_GNUC_UNUSED, break; =20 case VIR_DOMAIN_AUDIO_TYPE_OSS: { - g_autofree char *tryMMap =3D virXMLPropString(node, "tryMMap"); - g_autofree char *exclusive =3D virXMLPropString(node, "exclusive"); g_autofree char *dspPolicy =3D virXMLPropString(node, "dspPolicy"); =20 - if (tryMMap && ((def->backend.oss.tryMMap =3D - virTristateBoolTypeFromString(tryMMap)) <=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'tryMMap' value '%s'"), tryMMap); + if (virXMLPropTristateBool(node, "tryMMap", false, + &def->backend.oss.tryMMap) < 0) goto error; - } =20 - if (exclusive && ((def->backend.oss.exclusive =3D - virTristateBoolTypeFromString(exclusive)) <=3D = 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown 'exclusive' value '%s'"), exclusive); + if (virXMLPropTristateBool(node, "exclusive", false, + &def->backend.oss.exclusive) < 0) goto error; - } =20 if (dspPolicy) { if (virStrToLong_i(dspPolicy, NULL, 10, --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169614; cv=none; d=zohomail.com; s=zohoarc; b=m+chw2gYBFW9Mjzokv7oVbjbuUr20zCajyk24HgdhYsG9ADQJkBlTBGip6zhKPH6V3mbBKa/sU4r4FvXRBKpMmsQbwd0qicQUN1G8To7XIPPVSbR06l4vUK68lRIfGijY5XLYqnhV0vGw089IrMcsMYAj6kI07Gam8jLlDchoUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169614; 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=fIXg2LyY7MZl2L2giTxNaKpxXtWT/gVJSDcm9RApEWA=; b=BLN4ECIx1ak0TL7DZlmfr/wFBzHivxNORl6Yvh0C1unkh2U2U7dH80eDb3RkcZzCXQkX5UFRbStEOiE3PQqxmVGnpu3snyoxaPyhZAwL2rbUk4vxDuMRm+ceZUi/SGuGprh1bjb7EV+yEAWXw8sXkmWVbDrcVWQ7PJF5igzITDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 161616961448137.97272482283927; Fri, 19 Mar 2021 09:00:14 -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-20-V5G_zjmHONi3I7BRsA9yCA-1; Fri, 19 Mar 2021 12:00:10 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 14674108593D; Fri, 19 Mar 2021 16:00:03 +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 D217D10013D6; Fri, 19 Mar 2021 16:00:02 +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 848E31809C84; Fri, 19 Mar 2021 16:00:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG01u3007430 for ; Fri, 19 Mar 2021 12:00:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id 440041C95E; Fri, 19 Mar 2021 16:00:01 +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 54BB21F045; Fri, 19 Mar 2021 16:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169613; 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=fIXg2LyY7MZl2L2giTxNaKpxXtWT/gVJSDcm9RApEWA=; b=bERKRMVEejGkySVgr5c2ewCRGclEdT7M/N6di76D6lGgzg/t4mkiDSgbCkHdrrg5sAX7PX 3rEKNqEMtBP+VLx2yGziBKkTWgdPGo6h7fGOAIDymMxc/KV08J21LBi+7+AEMSMLkXFCLM uZW8LQIJfsvH8skkAS5Q+3G+IhsRGnA= X-MC-Unique: V5G_zjmHONi3I7BRsA9yCA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 36/51] domain_conf: Use virXMLPropTristateXXX in virDomainMemballoonDefParseXML Date: Fri, 19 Mar 2021 16:57:33 +0100 Message-Id: <20210319155748.680146-37-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0b5d8e5164..6b98d34eb4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14211,8 +14211,6 @@ virDomainMemballoonDefParseXML(virDomainXMLOptionPt= r xmlopt, VIR_XPATH_NODE_AUTORESTORE(ctxt) unsigned int period =3D 0; g_autofree char *model =3D NULL; - g_autofree char *freepage_reporting =3D NULL; - g_autofree char *deflate =3D NULL; =20 def =3D g_new0(virDomainMemballoonDef, 1); =20 @@ -14229,25 +14227,12 @@ virDomainMemballoonDefParseXML(virDomainXMLOption= Ptr xmlopt, goto error; } =20 - if ((deflate =3D virXMLPropString(node, "autodeflate"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(deflate)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid autodeflate attribute value '%s'"), = deflate); - goto error; - } - def->autodeflate =3D value; - } + if (virXMLPropTristateSwitch(node, "autodeflate", false, &def->autodef= late) < 0) + goto error; =20 - if ((freepage_reporting =3D virXMLPropString(node, "freePageReporting"= ))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(freepage_reporting)= ) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid freePageReporting attribute value '%= s'"), freepage_reporting); - goto error; - } - def->free_page_reporting =3D value; - } + if (virXMLPropTristateSwitch(node, "freePageReporting", false, + &def->free_page_reporting) < 0) + goto error; =20 ctxt->node =3D node; if (virXPathUInt("string(./stats/@period)", ctxt, &period) < -1) { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169622; cv=none; d=zohomail.com; s=zohoarc; b=eRU3Aj4lLqzLKR5r9v2vEfsnuPB072rw+0E738tOqS8r3e0VXHcaqqbVCOoLjlghqTWY0o1oxOqXcgdeDhVlDWQKZCmPM30rsZnz0vV9Ehnkyx6AoHeyB//1vwLXSOppmX+jgwBOWxeTyew8+6wnCQU80tQadIgONqe7p3zBwVk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169622; 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=zGDbarQ/oN1Efhgsoqop5y4VN4EMLefXsJV6tRPzU54=; b=VKan9OPVw2CeMLdkK3qIO9udeAQMJXuECgtljVHxMTCdglt7K5kc+vjE1P1QqZb+rxR6A8zwsIpS4S+ght85K39WvKvh7iM8A5PgJPXOyl1OvzNjfxq2FfBh9MOOiiLsy+qnTZQjB5zQncV6oVEvuURPOfBachIz0cR6VYFw28I= 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 1616169622550987.7615436142543; Fri, 19 Mar 2021 09:00:22 -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-43-6ELjFQ_nOU6PZGDo4-qQkA-1; Fri, 19 Mar 2021 12:00:15 -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 D1AB584BA75; Fri, 19 Mar 2021 16:00:07 +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 8FB9A5D730; Fri, 19 Mar 2021 16:00:07 +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 301F050039; Fri, 19 Mar 2021 16:00:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG02gU007454 for ; Fri, 19 Mar 2021 12:00:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 749F71C94B; Fri, 19 Mar 2021 16:00:02 +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 8F8AD1C955; Fri, 19 Mar 2021 16:00:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169620; 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=zGDbarQ/oN1Efhgsoqop5y4VN4EMLefXsJV6tRPzU54=; b=B6XT7j0H7o8xR38Maila4GZ3EXkZ/eMLzEdV6pjkVPxyU0pgJg2GZOMVuApNGy8QTkJQ9+ 34YX38CcDLH9Fs6lWOYLx49OdvE0hsvOnlQWIyXcYD6Hbo4stXoHEQpb+S9KCJLbpp2wlD fb7mzyw2duKjxlSlChPfMCUTu/Anbpk= X-MC-Unique: 6ELjFQ_nOU6PZGDo4-qQkA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 37/51] domain_conf: Use virXMLPropTristateXXX in virDomainShmemDefParseXML Date: Fri, 19 Mar 2021 16:57:34 +0100 Message-Id: <20210319155748.680146-38-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6b98d34eb4..ef1a9cdab2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14358,17 +14358,9 @@ virDomainShmemDefParseXML(virDomainXMLOptionPtr xm= lopt, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(msi, "ioeventfd"))) { - int val; - - if ((val =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid msi ioeventfd setting for shmem:= '%s'"), - tmp); - goto cleanup; - } - def->msi.ioeventfd =3D val; - } + if (virXMLPropTristateSwitch(msi, "ioeventfd", false, + &def->msi.ioeventfd) < 0) + goto cleanup; } =20 /* msi option is only relevant with a server */ --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169621; cv=none; d=zohomail.com; s=zohoarc; b=AOUYfe0nFvHjhlu9pf5+GCNCbfoiOcZfOZYpWOGDN7wCFS9LD+UNIraTSuk5UbSyAfaRnoKYd/89kBKEUJk3jem3hLDLy14nJo93f0GSptZR+lBFuOvthaDbyXpjzeXqlYW2Fh6Wz/bzAP0Aye80Zf63agmteWSw5u8Oe2NNyJk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169621; 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=AAZ0D4GIYnL63mnulJmIkGqIFS58YOzHHZmbfafMsVk=; b=RNHpCpmJ8MGeXBcvz3+Pop8oKLep1YvhqI+kg27E+1W0i6H4QnrZC8GTdF6XwNpWHKiNtqOgoOQeAwwlrxB89muS6T9MDw5ZGpIyhKXJSMPYSa4M8oM4n/f4aNvHU/p7lyQN4rNxSdrDUYILOrFMWWdlVEQjT+6ycxzaiVL0Wdc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169621035376.64445667768496; Fri, 19 Mar 2021 09:00:21 -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-270-QCfunl5zNO25q_N-fjAEyw-1; Fri, 19 Mar 2021 12:00:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BBDBC1922032; Fri, 19 Mar 2021 16:00:06 +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 69A9710013D7; Fri, 19 Mar 2021 16:00:06 +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 D90F24BB7B; Fri, 19 Mar 2021 16:00:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG036T007488 for ; Fri, 19 Mar 2021 12:00:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9E1791A353; Fri, 19 Mar 2021 16:00:03 +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 D01E81F048; Fri, 19 Mar 2021 16:00:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169618; 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=AAZ0D4GIYnL63mnulJmIkGqIFS58YOzHHZmbfafMsVk=; b=NPaHi/9jlKLVlIdkRfKh4/XOttusw63r6Q/pX0/80T6yRYLbsscW7gMTKa1GSBd7RUvRSg hppFDmqKuND3SUscw3+Tm8X73pKNj79OIs4mYAVFF/nBs5bl/M3F845qFLeux6QzaZdQqF 2kE7JuV6Zw8yBaP52sN7oesgBUfSIvM= X-MC-Unique: QCfunl5zNO25q_N-fjAEyw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 38/51] domain_conf: Use virXMLPropTristateXXX in virDomainPerfEventDefParseXML Date: Fri, 19 Mar 2021 16:57:35 +0100 Message-Id: <20210319155748.680146-39-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ef1a9cdab2..4debb895e9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15442,7 +15442,7 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr p= erf, { int event; g_autofree char *name =3D NULL; - g_autofree char *enabled =3D NULL; + virTristateBool enabled =3D VIR_TRISTATE_BOOL_ABSENT; =20 if (!(name =3D virXMLPropString(node, "name"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing perf event name= ")); @@ -15461,18 +15461,9 @@ virDomainPerfEventDefParseXML(virDomainPerfDefPtr = perf, return -1; } =20 - if (!(enabled =3D virXMLPropString(node, "enabled"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing state of perf event '%s'"), name); - return -1; - } - - if ((perf->events[event] =3D virTristateBoolTypeFromString(enabled)) <= 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid state '%s' of perf event '%s'"), - enabled, name); + if (virXMLPropTristateBool(node, "enabled", true, &enabled) < 0) return -1; - } + perf->events[event] =3D enabled; =20 return 0; } --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169627; cv=none; d=zohomail.com; s=zohoarc; b=GUi8i80/UHemy3nza4816LqakTcIMia94vHfBO9tbwYUKlXP1xMzJjHK+4PRB88z4HnQkkqX4JDt3wcKxNyM/tAtZK4P6JBT29hULaZN5FtPCI2NTfbvrFHRuvc7NgULvVYSG1erCPKPMVolZTU/Hb9aZa0XDBbK9xARZpRpeH4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169627; 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=tT8OUkpRc/iudR1yH6x3BPhd+g3dS656d2VroV/Wa6I=; b=KYTIkBMczUhD5+XqwPSoDGc7gMBezjhaUSZP0fAuzowg+jR/Revw+oW+I0hludAhVFP97vajqNZDEowCW8MPKtafUmZkZ0FdldtfFYodAP0ubJBw0nPy/0HnHO05T9+/1zvLHoDmiGSimeGPdf4mr2BjMyTRpPxXM6yCdV4Y2QY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169625091175.64026595164; Fri, 19 Mar 2021 09:00:25 -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-260-aQQuRraBMSSx7Ry1Q1RSvg-1; Fri, 19 Mar 2021 12:00:19 -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 11FCC5B362; Fri, 19 Mar 2021 16:00:12 +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 D13D360CEB; Fri, 19 Mar 2021 16:00:11 +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 82E37180C5A5; Fri, 19 Mar 2021 16:00:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG04ki007510 for ; Fri, 19 Mar 2021 12:00:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id C064716E3A; Fri, 19 Mar 2021 16:00:04 +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 0DD161F045; Fri, 19 Mar 2021 16:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169621; 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=tT8OUkpRc/iudR1yH6x3BPhd+g3dS656d2VroV/Wa6I=; b=NrZAMuvU2q5SpasN+eonwl4Vnh3IDpAXRDk6tjmZ92dFegGy1f6Dnev6IJg4WzgG8NBM1B StTSPr8k1GdNyPE/Vq8qDblf89DODyhoYTEBsyB7vTEI79YTHMB+xSrCitIzyXF2x4kRzM Maa8ha+gPUdN21XLm0g++U4i0YK5gLw= X-MC-Unique: aQQuRraBMSSx7Ry1Q1RSvg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 39/51] domain_conf: Use virXMLPropTristateXXX in virDomainMemoryDefParseXML Date: Fri, 19 Mar 2021 16:57:36 +0100 Message-Id: <20210319155748.680146-40-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4debb895e9..0b009bb237 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15705,16 +15705,8 @@ virDomainMemoryDefParseXML(virDomainXMLOptionPtr x= mlopt, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(memdevNode, "discard"))) { - if ((val =3D virTristateBoolTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid discard value '%s'"), tmp); - goto error; - } - - def->discard =3D val; - } - VIR_FREE(tmp); + if (virXMLPropTristateBool(memdevNode, "discard", false, &def->discard= ) < 0) + goto error; =20 /* Extract NVDIMM UUID. */ if (def->model =3D=3D VIR_DOMAIN_MEMORY_MODEL_NVDIMM && --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169630; cv=none; d=zohomail.com; s=zohoarc; b=oGJhD100pa+p6YQDrqVlF11ehbRcWHlacQKRPXwHQamOrzuJ9kbqgK3hPXlF9NShHGgPk47ccsIx/SE0TRxjIJCa0MdPe9fDpp5MEhgBHEQRggaz/OqqJEyxz5gHkobQYf7Da2kMztOM91qAUA4WRrNvKvVuxhgMewat1sr9Zpc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169630; 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=OEGVo8ss4eItIm+kyXLZPg5tThF0Y2sXFgKdqYf9AFg=; b=UJPHYQ7l6n5wj+M/gi6FXLw9M52Ut0LoopI1zjXjFHYtZFrG4op5uM/yTkOtkgYqqMQmk15LqSt+bl7OzPkKt2p3lRAPmnPA5nar+35CeE0NG4iI1mm2b7OQtSgDp4xXGvtp5ejOKslS4l/C4k0AFqmuQvbQRHdUDZKbMeakep4= 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 161616963091656.531181415139145; Fri, 19 Mar 2021 09:00:30 -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-568-Z83VNn3tN_aNh_MLtcg28g-1; Fri, 19 Mar 2021 12:00:25 -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 D49FF10866D0; Fri, 19 Mar 2021 16:00:16 +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 9F50860871; Fri, 19 Mar 2021 16:00:16 +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 4692450042; Fri, 19 Mar 2021 16:00:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG06GG007529 for ; Fri, 19 Mar 2021 12:00:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id E9D6F1F04C; Fri, 19 Mar 2021 16:00:05 +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 225E81A353; Fri, 19 Mar 2021 16:00:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169628; 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=OEGVo8ss4eItIm+kyXLZPg5tThF0Y2sXFgKdqYf9AFg=; b=jO8IZn/OihH9jC4nIJQR+RBDhKtTC+RgcgCGYEqy4KuoUVu6twfVeqGmyarxJ/6emNWH+P 1jWD2RlG7KFmLp4xQwGqAdz/QsUwRu4Bx1gxY0yC3j06//hfLpvM+n17vwztOjR7tWJANQ 5IlfhvYIt4oLirfTr59KqKTTgzcAmr8= X-MC-Unique: Z83VNn3tN_aNh_MLtcg28g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 40/51] domain_conf: Use virXMLPropTristateXXX in virDomainIOMMUDefParseXML Date: Fri, 19 Mar 2021 16:57:37 +0100 Message-Id: <20210319155748.680146-41-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0b009bb237..c7d2e86dfe 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15776,40 +15776,17 @@ virDomainIOMMUDefParseXML(xmlNodePtr node, iommu->model =3D val; =20 if ((driver =3D virXPathNode("./driver", ctxt))) { - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(driver, "intremap"))) { - if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown intremap valu= e: %s"), tmp); - return NULL; - } - iommu->intremap =3D val; - } + if (virXMLPropTristateSwitch(driver, "intremap", false, &iommu->in= tremap) < 0) + return NULL; =20 - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(driver, "caching_mode"))) { - if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown caching_mode = value: %s"), tmp); - return NULL; - } - iommu->caching_mode =3D val; - } - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(driver, "iotlb"))) { - if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown iotlb value: = %s"), tmp); - return NULL; - } - iommu->iotlb =3D val; - } + if (virXMLPropTristateSwitch(driver, "caching_mode", false, &iommu= ->caching_mode) < 0) + return NULL; =20 - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(driver, "eim"))) { - if ((val =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, _("unknown eim value: %s= "), tmp); - return NULL; - } - iommu->eim =3D val; - } + if (virXMLPropTristateSwitch(driver, "iotlb", false, &iommu->iotlb= ) < 0) + return NULL; + + if (virXMLPropTristateSwitch(driver, "eim", false, &iommu->eim) < = 0) + return NULL; =20 VIR_FREE(tmp); if ((tmp =3D virXMLPropString(driver, "aw_bits"))) { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169865; cv=none; d=zohomail.com; s=zohoarc; b=bIh+kXcTHpSAiE0Ll90XknVZN4Wbk5w3O32ntoevyitFmlQhAw0Cp+gFxOxCoPgPh4Eo/vTeNNHU/1TdHV6ccJxfghDYBkTtk8IUMKXSO4bG7o4/sPgREuTqZ7SiJp4DOholHQ7DpTubR4svvJre5JzRw5eM71BIseIGdvHrxv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169865; 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=XmfPgVokifZVla5TdYg6Pgyrg80Sj2KGKFpoHKilQDU=; b=Oxp/5hn6t/dXtXxq2C4U2XCt4150cvS5whYj1yssGiuJuL0kZkk5OlPcRut0QwBfYAd9b6/eHRehJoQCdp762ipHWZw47YqN3pVT8wpTcIJbSqB+U6v1QptcdkV3o81P9xYU+amyt1VMi0J23ju4RVzrA+VvH3+GCpWxZhOpSEU= 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 1616169865873779.2871526427034; Fri, 19 Mar 2021 09:04:25 -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-425-3NibpZrFOUenM_wXdUShTg-1; Fri, 19 Mar 2021 12:00:21 -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 9CA9D10866A3; Fri, 19 Mar 2021 16:00: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 6D88E5DAA5; Fri, 19 Mar 2021 16:00:11 +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 023D250041; Fri, 19 Mar 2021 16:00:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG07Qd007539 for ; Fri, 19 Mar 2021 12:00:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 205F41A353; Fri, 19 Mar 2021 16:00:07 +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 53DC21F045; Fri, 19 Mar 2021 16:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169624; 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=XmfPgVokifZVla5TdYg6Pgyrg80Sj2KGKFpoHKilQDU=; b=Og62qg17h+xxNU7MuyORs5QUjhIJzeHZWDNlQ1MybU7Jd5PEBVFu2BcmWkNoH1ho0IBgjh LTMe9fqx0xbMpDe/gvQ1e90fxilY2SjqbPy8EKlw5HWGq7nlqEdcuDyg6dGLjUlpIb8RKu cL9ORdWYBAnpGZNLm4zAcztymrw99tQ= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169864; 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=XmfPgVokifZVla5TdYg6Pgyrg80Sj2KGKFpoHKilQDU=; b=g1kxsBM9Du5Oi3fip4QfyG2rfp1YFAzaULL0gruFaUTznwoWXdUxnzCrCyv3UKpswn0sZV Ddbo3VVTCfPLxxrdmkgoWQcz1gs8zX1ruFXPT+opd/EKzkTzKM38sJAPn8SIdPHugZ1Ha5 +RmBDMJeWfJBsGpZdZMA0y4E0GkNv8Q= X-MC-Unique: 3NibpZrFOUenM_wXdUShTg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 41/51] domain_conf: Use virXMLPropTristateXXX in virDomainVsockDefParseXML Date: Fri, 19 Mar 2021 16:57:38 +0100 Message-Id: <20210319155748.680146-42-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.14 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) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c7d2e86dfe..3289c9fa12 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15841,17 +15841,8 @@ virDomainVsockDefParseXML(virDomainXMLOptionPtr xm= lopt, } } =20 - VIR_FREE(tmp); - if ((tmp =3D virXMLPropString(cid, "auto"))) { - val =3D virTristateBoolTypeFromString(tmp); - if (val <=3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("'auto' attribute can be 'yes' or 'no': %= s"), - tmp); - return NULL; - } - vsock->auto_cid =3D val; - } + if (virXMLPropTristateBool(cid, "auto", false, &vsock->auto_cid) <= 0) + return NULL; } =20 if (virDomainDeviceInfoParseXML(xmlopt, node, ctxt, &vsock->info, flag= s) < 0) --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169634; cv=none; d=zohomail.com; s=zohoarc; b=mB5xsQgiLNX6wn79X6+L/zkepG/H1AbT9JkQvveCSOwnlP9ZP2Ze/fxsnmElFkx6zyxxl1HkNpUVMg5vasevnnDTWOXzKIQ8H8Xs4kVnFpc41vsa6p88wEHJdOR1fqR407ikSkOQLDQpldSxOhdKYc/Uo9dgNkcVtWAr83kE3HA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169634; 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=AYn+3N3zMJIu6ox5vvQ2o2hHhiG9xUlxc0ZqQQNU3R8=; b=UG07nWV9blWvaKnNf4/0tajV92rB8byPEufQGlaq5egfP5SG1Q42OW6dG6srzOxyy6vSK4Ye/wj+DrtKf4voN8huNuquT6ziZjMrvn9oJNcQwmqCVDgYTSdo9nnjlBDgMgxCkE7tWbzcCTO26TyLhRVXk5BN9Qi/brPGk5qULV0= 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 1616169634637116.95698130969708; Fri, 19 Mar 2021 09:00:34 -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-259-iKHBT6jaPdCr9_hBne3CHg-1; Fri, 19 Mar 2021 12:00:28 -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 E7F6081431F; Fri, 19 Mar 2021 16:00:20 +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 BA20C5D6D5; Fri, 19 Mar 2021 16:00:20 +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 6B05C1809C84; Fri, 19 Mar 2021 16:00:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG08F8007544 for ; Fri, 19 Mar 2021 12:00:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 448C018E4B; Fri, 19 Mar 2021 16:00:08 +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 7EEA71A353; Fri, 19 Mar 2021 16:00:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169631; 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=AYn+3N3zMJIu6ox5vvQ2o2hHhiG9xUlxc0ZqQQNU3R8=; b=g/dJS4cy4fqlQu39LMJJyNm3XQbnTNjPUM6VWNAQQsHMHdj+0mk1MNBa/iB+dXM8QiF3bo RAPMBjW4lCs+Ft3GOkqOLBx5hX4gQy9GtmEpVusYgdk8IKE7g7zeLxxSLAUacwvaQ5wUFU MUoRsuiLqGG0nYJj/wF0kB9K9c6dsJc= X-MC-Unique: iKHBT6jaPdCr9_hBne3CHg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 42/51] domain_conf: Use virXMLPropTristateXXX in virDomainFeaturesDefParse Date: Fri, 19 Mar 2021 16:57:39 +0100 Message-Id: <20210319155748.680146-43-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 146 ++++++++++------------------------------- 1 file changed, 33 insertions(+), 113 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3289c9fa12..dfa8b98aae 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18236,6 +18236,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def, =20 for (i =3D 0; i < n; i++) { g_autofree char *tmp =3D NULL; + virTristateSwitch triSwitch =3D VIR_TRISTATE_SWITCH_ABSENT; int val =3D virDomainFeatureTypeFromString((const char *)nodes[i]-= >name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -18245,16 +18246,8 @@ virDomainFeaturesDefParse(virDomainDefPtr def, =20 switch ((virDomainFeature) val) { case VIR_DOMAIN_FEATURE_APIC: - if ((tmp =3D virXPathString("string(./features/apic/@eoi)", ct= xt))) { - int eoi; - if ((eoi =3D virTristateSwitchTypeFromString(tmp)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown value for attribute eoi: '%s= '"), - tmp); - return -1; - } - def->apic_eoi =3D eoi; - } + if (virXMLPropTristateSwitch(nodes[i], "eoi", false, &def->api= c_eoi) < 0) + return -1; G_GNUC_FALLTHROUGH; case VIR_DOMAIN_FEATURE_ACPI: case VIR_DOMAIN_FEATURE_PAE: @@ -18286,16 +18279,10 @@ virDomainFeaturesDefParse(virDomainDefPtr def, case VIR_DOMAIN_FEATURE_PVSPINLOCK: case VIR_DOMAIN_FEATURE_VMPORT: case VIR_DOMAIN_FEATURE_SMM: - if ((tmp =3D virXMLPropString(nodes[i], "state"))) { - if ((def->features[val] =3D virTristateSwitchTypeFromStrin= g(tmp)) =3D=3D -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feat= ure '%s'"), - tmp, virDomainFeatureTypeToString(val)); - return -1; - } - } else { + if (virXMLPropTristateSwitch(nodes[i], "state", false, &triSwi= tch) < 0) + return -1; + if ((def->features[val] =3D triSwitch) =3D=3D VIR_TRISTATE_SWI= TCH_ABSENT) def->features[val] =3D VIR_TRISTATE_SWITCH_ON; - } break; =20 case VIR_DOMAIN_FEATURE_GIC: @@ -18403,18 +18390,9 @@ virDomainFeaturesDefParse(virDomainDefPtr def, case VIR_DOMAIN_FEATURE_HTM: case VIR_DOMAIN_FEATURE_NESTED_HV: case VIR_DOMAIN_FEATURE_CCF_ASSIST: - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("missing state attribute '%s' of feature = '%s'"), - tmp, virDomainFeatureTypeToString(val)); - return -1; - } - if ((def->features[val] =3D virTristateSwitchTypeFromString(tm= p)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature = '%s'"), - tmp, virDomainFeatureTypeToString(val)); + if (virXMLPropTristateSwitch(nodes[i], "state", true, &triSwit= ch) < 0) return -1; - } + def->features[val] =3D triSwitch; break; =20 /* coverity[dead_error_begin] */ @@ -18426,13 +18404,12 @@ virDomainFeaturesDefParse(virDomainDefPtr def, =20 if (def->features[VIR_DOMAIN_FEATURE_HYPERV] =3D=3D VIR_TRISTATE_SWITC= H_ON) { int feature; - int value; + virTristateSwitch state =3D VIR_TRISTATE_SWITCH_ABSENT; xmlNodePtr node =3D ctxt->node; if ((n =3D virXPathNodeSet("./features/hyperv/*", ctxt, &nodes)) <= 0) return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; feature =3D virDomainHypervTypeFromString((const char *)nodes[= i]->name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -18443,23 +18420,10 @@ virDomainFeaturesDefParse(virDomainDefPtr def, =20 ctxt->node =3D nodes[i]; =20 - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "HyperV Enlightenment feature '%s'"), - nodes[i]->name); - return -1; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for HyperV Enlightenment feature '%s'"), - nodes[i]->name); + if (virXMLPropTristateSwitch(nodes[i], "state", true, &state) = < 0) return -1; - } =20 - def->hyperv_features[feature] =3D value; + def->hyperv_features[feature] =3D state; =20 switch ((virDomainHyperv) feature) { case VIR_DOMAIN_HYPERV_RELAXED: @@ -18477,7 +18441,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def, break; =20 case VIR_DOMAIN_HYPERV_SPINLOCKS: - if (value !=3D VIR_TRISTATE_SWITCH_ON) + if (state !=3D VIR_TRISTATE_SWITCH_ON) break; =20 if (virXPathUInt("string(./@retries)", ctxt, @@ -18496,7 +18460,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def, break; =20 case VIR_DOMAIN_HYPERV_VENDOR_ID: - if (value !=3D VIR_TRISTATE_SWITCH_ON) + if (state !=3D VIR_TRISTATE_SWITCH_ON) break; =20 if (!(def->hyperv_vendor_id =3D virXMLPropString(nodes[i], @@ -18533,13 +18497,12 @@ virDomainFeaturesDefParse(virDomainDefPtr def, } =20 if (def->hyperv_features[VIR_DOMAIN_HYPERV_STIMER] =3D=3D VIR_TRISTATE= _SWITCH_ON) { - int value; + virTristateSwitch state =3D VIR_TRISTATE_SWITCH_ABSENT; + if ((n =3D virXPathNodeSet("./features/hyperv/stimer/*", ctxt, &no= des)) < 0) return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; - if (STRNEQ((const char *)nodes[i]->name, "direct")) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported Hyper-V stimer feature: %s"), @@ -18547,33 +18510,21 @@ virDomainFeaturesDefParse(virDomainDefPtr def, return -1; } =20 - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "Hyper-V stimer '%s' feature"), "direct"); - return -1; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for Hyper-V stimer '%s' feature"), "dire= ct"); + if (virXMLPropTristateSwitch(nodes[i], "state", true, &state) = < 0) return -1; - } - - def->hyperv_stimer_direct =3D value; + def->hyperv_stimer_direct =3D state; } VIR_FREE(nodes); } =20 if (def->features[VIR_DOMAIN_FEATURE_KVM] =3D=3D VIR_TRISTATE_SWITCH_O= N) { int feature; - int value; + if ((n =3D virXPathNodeSet("./features/kvm/*", ctxt, &nodes)) < 0) return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; + virTristateSwitch state =3D VIR_TRISTATE_SWITCH_ABSENT; =20 feature =3D virDomainKVMTypeFromString((const char *)nodes[i]-= >name); if (feature < 0) { @@ -18587,23 +18538,9 @@ virDomainFeaturesDefParse(virDomainDefPtr def, case VIR_DOMAIN_KVM_HIDDEN: case VIR_DOMAIN_KVM_DEDICATED: case VIR_DOMAIN_KVM_POLLCONTROL: - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "KVM feature '%s'"), - nodes[i]->name); - return -1; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for KVM feature '%s'"), - nodes[i]->name); + if (virXMLPropTristateSwitch(nodes[i], "state", true, = &state) < 0) return -1; - } - - def->kvm_features[feature] =3D value; + def->kvm_features[feature] =3D state; break; =20 /* coverity[dead_error_begin] */ @@ -18616,14 +18553,13 @@ virDomainFeaturesDefParse(virDomainDefPtr def, =20 if (def->features[VIR_DOMAIN_FEATURE_XEN] =3D=3D VIR_TRISTATE_SWITCH_O= N) { int feature; - int value; g_autofree char *ptval =3D NULL; - g_autofree char *tmp =3D NULL; =20 if ((n =3D virXPathNodeSet("./features/xen/*", ctxt, &nodes)) < 0) return -1; =20 for (i =3D 0; i < n; i++) { + virTristateSwitch state =3D VIR_TRISTATE_SWITCH_ABSENT; feature =3D virDomainXenTypeFromString((const char *)nodes[i]-= >name); if (feature < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -18632,30 +18568,17 @@ virDomainFeaturesDefParse(virDomainDefPtr def, return -1; } =20 - if (!(tmp =3D virXMLPropString(nodes[i], "state"))) { - virReportError(VIR_ERR_XML_ERROR, - _("missing 'state' attribute for " - "Xen feature '%s'"), - nodes[i]->name); - return -1; - } - - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for Xen feature '%s'"), - nodes[i]->name); + if (virXMLPropTristateSwitch(nodes[i], "state", true, &state) = < 0) return -1; - } =20 - def->xen_features[feature] =3D value; + def->xen_features[feature] =3D state; =20 switch ((virDomainXen) feature) { case VIR_DOMAIN_XEN_E820_HOST: break; =20 case VIR_DOMAIN_XEN_PASSTHROUGH: - if (value !=3D VIR_TRISTATE_SWITCH_ON) + if (state !=3D VIR_TRISTATE_SWITCH_ON) break; =20 if ((ptval =3D virXMLPropString(nodes[i], "mode"))) { @@ -18725,7 +18648,7 @@ virDomainFeaturesDefParse(virDomainDefPtr def, return -1; =20 for (i =3D 0; i < n; i++) { - g_autofree char *tmp =3D NULL; + virTristateSwitch state =3D VIR_TRISTATE_SWITCH_ABSENT; int val =3D virDomainProcessCapsFeatureTypeFromString((const char = *)nodes[i]->name); if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, @@ -18733,16 +18656,13 @@ virDomainFeaturesDefParse(virDomainDefPtr def, return -1; } =20 - if ((tmp =3D virXMLPropString(nodes[i], "state"))) { - if ((def->caps_features[val] =3D virTristateSwitchTypeFromStri= ng(tmp)) =3D=3D -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown state attribute '%s' of feature = capability '%s'"), - tmp, virDomainProcessCapsFeatureTypeToStrin= g(val)); - return -1; - } - } else { - def->caps_features[val] =3D VIR_TRISTATE_SWITCH_ON; - } + if (virXMLPropTristateSwitch(nodes[i], "state", false, &state) < 0) + return -1; + + if (state =3D=3D VIR_TRISTATE_SWITCH_ABSENT) + state =3D VIR_TRISTATE_SWITCH_ON; + + def->caps_features[val] =3D state; } VIR_FREE(nodes); return 0; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169665; cv=none; d=zohomail.com; s=zohoarc; b=eZPYHd0e+5q13LHbjeZ5+iHiveVJu3kab5+86bEg1xPNxSCXK/MlYxgrsqtZH0364FDE4xMbK1At/w5T2jRvjzsIh3qZ7p1jaxc2i6KEXo5dqu5rVUgilDah6VM0EjN7MHi5TgBb3p9Q4fIRAicB9wkDcGJ3+X9EzD2cmCNwTwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169665; 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=Kry5pRJRksjFIEu1VSO+TISZ0y5wBqH1pJfIg/1I1T8=; b=MwsWBrizYz3zAb3RxikFPKyClXhPOCedXoLUQ1BoWkf9/Fzz4c6R7V6t/UvhpifBnr38whGX0ACcPMN61bVdm1hcpdtBWc4i49//ceVOZiTMCrQ4MQTw/VTwmB2N56BzoSZWdb+KBQxwQKvHbQtfeTUAfRSe1MTpE44wZZtegxo= 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 1616169665582921.1305907626175; Fri, 19 Mar 2021 09:01:05 -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-398-9sfIoeIvP1KZbtwEZdMkVQ-1; Fri, 19 Mar 2021 12:00:19 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 008D210866A7; Fri, 19 Mar 2021 16:00:13 +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 B1D0B10013D6; Fri, 19 Mar 2021 16:00:12 +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 59AFF180C5C6; Fri, 19 Mar 2021 16:00:12 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG09Ou007550 for ; Fri, 19 Mar 2021 12:00:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 711C21A353; Fri, 19 Mar 2021 16:00:09 +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 9A93316E3A; Fri, 19 Mar 2021 16:00:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169663; 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=Kry5pRJRksjFIEu1VSO+TISZ0y5wBqH1pJfIg/1I1T8=; b=UpfjzFKwnP6orHQLPqanfCGrROLOu4ipsYVvAIplmbexhu5eetlksdwBvuVkDbAjcqpsqA 1f2kR7Ujb5v/9+04a8uqXzQ4A8mHwYoXIIbc/zW8pu+3VgjSmFB+LcxzuONkbl3YpUd+oL C3vkYuBJL2AwkV0TwgAWw3nYkrjyLjE= X-MC-Unique: 9sfIoeIvP1KZbtwEZdMkVQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 43/51] domain_conf: Use virXMLPropTristateXXX in virDomainLoaderDefParseXML Date: Fri, 19 Mar 2021 16:57:40 +0100 Message-Id: <20210319155748.680146-44-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index dfa8b98aae..55405d129b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18712,14 +18712,12 @@ virDomainLoaderDefParseXML(xmlNodePtr node, virDomainLoaderDefPtr loader, bool fwAutoSelect) { - g_autofree char *readonly_str =3D NULL; - g_autofree char *secure_str =3D NULL; g_autofree char *type_str =3D NULL; =20 - secure_str =3D virXMLPropString(node, "secure"); - if (!fwAutoSelect) { - readonly_str =3D virXMLPropString(node, "readonly"); + if (virXMLPropTristateBool(node, "readonly", false, &loader->reado= nly) < 0) + return -1; + type_str =3D virXMLPropString(node, "type"); if (!(loader->path =3D virXMLNodeContentString(node))) return -1; @@ -18728,25 +18726,8 @@ virDomainLoaderDefParseXML(xmlNodePtr node, VIR_FREE(loader->path); } =20 - if (readonly_str) { - int value; - if ((value =3D virTristateBoolTypeFromString(readonly_str)) <=3D 0= ) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown readonly value: %s"), readonly_str); - return -1; - } - loader->readonly =3D value; - } - - if (secure_str) { - int value; - if ((value =3D virTristateBoolTypeFromString(secure_str)) <=3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown secure value: %s"), secure_str); - return -1; - } - loader->secure =3D value; - } + if (virXMLPropTristateBool(node, "secure", false, &loader->secure) < 0) + return -1; =20 if (type_str) { int type; --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169725; cv=none; d=zohomail.com; s=zohoarc; b=KcMtOldtniRu/ipIys4jNXubIcgTcNDnq3ZJev7QocZlQiynOv4i61TnP044HIUchJREqjiNJHDpRlLhR+1s46y9VN1VzFsEO3qtRsYeIovBxGo0vDxoWSmRzfBPoNwKAj5sJh8Uoq1mHi4cAaCREK2jGR9WxYPywpz8FpDqV5g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169725; 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=CCBXRmoVzOiEJubC5S124ggxD6Th1U2DaOqxu4s9AuA=; b=W32igr7ZEPqGramFYaf/Gv0ZPLdDg6s+eEdGHkwX2dNgp2e5sq086zAFlUsJ5s+Fvq67mfV4tlM+Xp7ceMTiBUxI0MCqxUh7mUEV6EQHpzIPsB3rL7G8QkyDRBTryO42UIia0mNS5Nar+9DvUx9xmMcJNprPt8GXKG6Gm2O8S34= 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 1616169725122783.1425381910266; Fri, 19 Mar 2021 09:02:05 -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-266-fHgGGafjOe2Jseb3blRkjA-1; Fri, 19 Mar 2021 12:00:27 -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 ABFB5101F7DE; Fri, 19 Mar 2021 16:00:17 +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 786DB6F973; Fri, 19 Mar 2021 16:00:17 +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 1E2FB50048; Fri, 19 Mar 2021 16:00:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0AWw007567 for ; Fri, 19 Mar 2021 12:00:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9FDDF1A353; Fri, 19 Mar 2021 16:00:10 +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 D0B1D18E4B; Fri, 19 Mar 2021 16:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169723; 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=CCBXRmoVzOiEJubC5S124ggxD6Th1U2DaOqxu4s9AuA=; b=GigflOyxoMvICOIkdib7/kYt55EANvMK+YOSNe6XkDNoq9141btzaPImqW5g9r4oNq8Wil caDof8kIuXDGjus2cplbjVBG20hLs7acrdUnjNWaDID5bzSo+93GkpQuahpWE/nOjg7uDE nQkOcak+tnW+w/+O+KMw9zFWWPpFSGc= X-MC-Unique: fHgGGafjOe2Jseb3blRkjA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 44/51] domain_conf: Use virXMLPropTristateXXX in virDomainVcpuParse Date: Fri, 19 Mar 2021 16:57:41 +0100 Message-Id: <20210319155748.680146-45-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 55405d129b..97c7a3ec28 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18998,7 +18998,7 @@ virDomainVcpuParse(virDomainDefPtr def, =20 for (i =3D 0; i < n; i++) { virDomainVcpuDefPtr vcpu; - int state; + virTristateBool state; unsigned int id; unsigned int order; =20 @@ -19020,31 +19020,13 @@ virDomainVcpuParse(virDomainDefPtr def, =20 vcpu =3D virDomainDefGetVcpu(def, id); =20 - if (!(tmp =3D virXMLPropString(nodes[i], "enabled"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing vcpu enabled state")); + if (virXMLPropTristateBool(nodes[i], "enabled", true, &state) = < 0) return -1; - } - - if ((state =3D virTristateBoolTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid vcpu 'enabled' value '%s'"), tmp= ); - return -1; - } - VIR_FREE(tmp); - vcpu->online =3D state =3D=3D VIR_TRISTATE_BOOL_YES; =20 - if ((tmp =3D virXMLPropString(nodes[i], "hotpluggable"))) { - int hotpluggable; - if ((hotpluggable =3D virTristateBoolTypeFromString(tmp)) = < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid vcpu 'hotpluggable' value '%= s'"), tmp); - return -1; - } - vcpu->hotpluggable =3D hotpluggable; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(nodes[i], "hotpluggable", false, + &vcpu->hotpluggable) < 0) + return -1; =20 if ((tmp =3D virXMLPropString(nodes[i], "order"))) { if (virStrToLong_uip(tmp, NULL, 10, &order) < 0) { --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169666; cv=none; d=zohomail.com; s=zohoarc; b=G1Y9tFB7Qz/bL8kQR1gs8NbqsqfGJn2eBuF3BByCqM3J0AbtTLNzgBca3HXZro1/DlXIYsoinNL7lVB88tHfyLuZT2+Bj4oYe9SWXwXOfWS8PEcQH5FT1aBB4Nr1zRZMX/ZoyHOUWoUI0IxqYzkq1LG//IRj9R/tTM9FBtR/jWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169666; 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=cRUFcWqdU3iUGCgxg4856Q4Yp7dSP6eKM2f1oXqhSZg=; b=i0cFoEIwTiCLskZ1ZKUN9B6flgOBixiDuyi/LIl9HeAx1WG1hbNQpWDKaSQXTpt4Uc22W6Z2BC3ONahVVhjeoyYpQ4TPFSvFSR5S8AoWTGVIFzNMeszqLdcl1n6nK/gQ2J1J2DdVsVG4cOBuJpDQrQLGPYFv3PoOOih+xs61l70= 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 1616169666124963.3846403057543; Fri, 19 Mar 2021 09:01:06 -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-386-xRhMaeP_MWK25HKK2k7J6A-1; Fri, 19 Mar 2021 12:00:30 -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 D59961034AF0; Fri, 19 Mar 2021 16:00:24 +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 AB41C60871; Fri, 19 Mar 2021 16:00:24 +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 548BE5004C; Fri, 19 Mar 2021 16:00:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0B1N007587 for ; Fri, 19 Mar 2021 12:00:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id BC4C11A86F; Fri, 19 Mar 2021 16:00:11 +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 05C481C95E; Fri, 19 Mar 2021 16:00:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169663; 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=cRUFcWqdU3iUGCgxg4856Q4Yp7dSP6eKM2f1oXqhSZg=; b=QaDopSLlvwyczKz0K3VJUnk/f5tIz4G05QIWMF+8h9yKzKffxaQv6J6TtTwxk9WNMVaBGO +1nPRIp86KOr64NW7iSHuQNXp3yUvyGz90zYrGsZeVBZoqqKfKyd7Un8u2gckPDUf1DrwL lU1V9E4PF60nq2AYmYCGaMhon4Ns0tE= X-MC-Unique: xRhMaeP_MWK25HKK2k7J6A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 45/51] backup_conf: Use virXMLPropTristateXXX in virDomainBackupDiskDefParseXML Date: Fri, 19 Mar 2021 16:57:42 +0100 Message-Id: <20210319155748.680146-46-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/backup_conf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index ba58b2e322..ce85ed8bad 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -106,7 +106,6 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, g_autofree char *type =3D NULL; g_autofree char *format =3D NULL; g_autofree char *idx =3D NULL; - g_autofree char *backup =3D NULL; g_autofree char *state =3D NULL; g_autofree char *backupmode =3D NULL; int tmp; @@ -125,17 +124,10 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, return -1; } =20 - def->backup =3D VIR_TRISTATE_BOOL_YES; - - if ((backup =3D virXMLPropString(node, "backup"))) { - if ((tmp =3D virTristateBoolTypeFromString(backup)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid disk 'backup' state '%s'"), backup); - return -1; - } - - def->backup =3D tmp; - } + if (virXMLPropTristateBool(node, "backup", false, &def->backup) < 0) + return -1; + if (def->backup =3D=3D VIR_TRISTATE_BOOL_ABSENT) + def->backup =3D VIR_TRISTATE_BOOL_YES; =20 /* don't parse anything else if backup is disabled */ if (def->backup =3D=3D VIR_TRISTATE_BOOL_NO) --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169665; cv=none; d=zohomail.com; s=zohoarc; b=ltWKtvKfvfLGXf6SwZ7T28Ctz050w57StRV4QwHHF6wk9kmK+daboDjLlB/o4891IvcEdeyM9qzCq4BDF4BKGF0Gwn+Yq7cP9hkcpUx9/+Xm5N4Vs6x9uq6LB/p1ClvepeM4t9kXu4qCcKSf+HQOn+MQeNra74IKuHhXjtoAIsE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169665; 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=rwhZqHX4fWsL6sdlZjohAnidIeGl+VFJlN+EYEImTdI=; b=IE8mddvheHHjyYEgjM/5fkAQezNKMAxT/PBbSuuWifYl0fJrqfKempFuszgkZaa+s0nT7dP73CW+RChOxEUi5ocu0OciFxLTZzmDMUD1x7Pefzoaxcd9Vrbb5cmBrWlRBhDO6gcLvhCl2Vt373EbhP7QkpAu+kmza+45M4dgm5U= 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 1616169665979990.8437516397366; Fri, 19 Mar 2021 09:01:05 -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-296-KFQWXvS6Nb2i3ysfey2rgQ-1; Fri, 19 Mar 2021 12:00:37 -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 CFE4A63CDC; Fri, 19 Mar 2021 16:00:28 +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 9CEF75D72F; Fri, 19 Mar 2021 16:00:28 +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 4B3F3180C5AA; Fri, 19 Mar 2021 16:00:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0CgO007596 for ; Fri, 19 Mar 2021 12:00:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id DBA271A353; Fri, 19 Mar 2021 16:00:12 +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 1BFF71A86F; Fri, 19 Mar 2021 16:00:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169663; 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=rwhZqHX4fWsL6sdlZjohAnidIeGl+VFJlN+EYEImTdI=; b=MCHwpKqQ1gTgOHObDaHo2TN93LEjNy5EhUVUtKubZ/sZUqYprLDZv6ELJyTpp+ARHNu+Kb qxnIivYBsVJOsizUC2oZlK6KS1NKRK0W4CpCt4IX5IMFlX5lP3p/nNaPNfrY2UToE624/C ENhjTUFz5RaLxYxjfqRFco1naZk2ljE= X-MC-Unique: KFQWXvS6Nb2i3ysfey2rgQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 46/51] backup_conf: Use virXMLPropTristateXXX in virDomainBackupDefParse Date: Fri, 19 Mar 2021 16:57:43 +0100 Message-Id: <20210319155748.680146-47-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Reviewed-by: Michal Privoznik --- src/conf/backup_conf.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index ce85ed8bad..d3ea9ce4a3 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -234,8 +234,6 @@ virDomainBackupDefParse(xmlXPathContextPtr ctxt, def->incremental =3D virXPathString("string(./incremental)", ctxt); =20 if ((node =3D virXPathNode("./server", ctxt))) { - g_autofree char *tls =3D NULL; - if (def->type !=3D VIR_DOMAIN_BACKUP_TYPE_PULL) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("use of requires pull mode backup")); @@ -261,18 +259,8 @@ virDomainBackupDefParse(xmlXPathContextPtr ctxt, return NULL; } =20 - if ((tls =3D virXMLPropString(node, "tls"))) { - int tmp; - - if ((tmp =3D virTristateBoolTypeFromString(tls)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown value '%s' of 'tls' attribute"),\ - tls); - return NULL; - } - - def->tls =3D tmp; - } + if (virXMLPropTristateBool(node, "tls", false, &def->tls) < 0) + return NULL; } =20 if ((n =3D virXPathNodeSet("./disks/*", ctxt, &nodes)) < 0) --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169865; cv=none; d=zohomail.com; s=zohoarc; b=B76JO9qiJVJBjr/urHUP3jqT3FiJkVR3VmBONOgR3LtGbTp7sZ/pRbBE+Rk9Cc6GTdFosZP7V+jJNkMiB8Pd13L9wZk733/nH/cqOKfFiWeY4oEOSbxXHRm4G3Fjfqmc57tyRQ5mAeqrIqdjeC4KCMRp+0LtETZqdpX5VLIwhmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169865; 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=VSPLESDVuIulx4QvXFuWrpv7oy0nu56eWahP+SU+lXo=; b=iKIiJ2F9lwTTBszVpibXMhSRTo6NoO3tRmz8XXtJdIekKfkpn2gJ4SzwrqEh7NDd/IlQ4bC/kOxPPlrKJ2DMKzAe3eRxu9WbGnZhvldFzvy4xi7IcGZYOWEppWjmfSUW4+5gGYc6b3CgnuLY1xHY1vVSpB7oq9ziQ88eQ8X8Q0Y= 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 1616169865384284.3262009246341; Fri, 19 Mar 2021 09:04:25 -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-582-_9BizXIUNEeqOvD0R_OSFA-1; Fri, 19 Mar 2021 12:00:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EFDD3612B0; Fri, 19 Mar 2021 16:00:16 +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 C8B4151C34; Fri, 19 Mar 2021 16:00:16 +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 7B1C450044; Fri, 19 Mar 2021 16:00:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0E8D007632 for ; Fri, 19 Mar 2021 12:00:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 01D7B16E3A; Fri, 19 Mar 2021 16:00:14 +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 40C5A1F40F; Fri, 19 Mar 2021 16:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169663; 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=VSPLESDVuIulx4QvXFuWrpv7oy0nu56eWahP+SU+lXo=; b=HNbvGxFOZd33ePOFo/FPCxVC3nY+F3A2rDDsiolqBzM0Qams/NEG943WuiyY8gJnoFQBbH KSNyX0Qr2EMxtogEm444nWn9/MKcqQbbbD+M0ag/S365RieIiXyoGaBq20cHGIyAqlvd30 pkoeExNbRkMYubqBTBOEbwKk1Z9td6o= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169863; 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=VSPLESDVuIulx4QvXFuWrpv7oy0nu56eWahP+SU+lXo=; b=IyZHNvSRCw2NFavA6lDxIq7aZjEE2Ipq8//O2Bfd6MpfD1V1oRHWvjxc/Gkab3h3Gxd2CO 6HnWHzpxJCUdy7sDbu71x0SRvZyxUvdc/E69zxQnGZMY2SHKYq46Vpcdlza8YRab8eRunB 3/2iZmq9qTUovWr22dUz/r25GCVyh/M= X-MC-Unique: _9BizXIUNEeqOvD0R_OSFA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 47/51] device_conf: Use virXMLPropTristateXXX in virPCIDeviceAddressParseXML Date: Fri, 19 Mar 2021 16:57:44 +0100 Message-Id: <20210319155748.680146-48-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.12 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) (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/device_conf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 0dd60985e9..8d0540bb02 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -214,7 +214,6 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, g_autofree char *bus =3D virXMLPropString(node, "bus"); g_autofree char *slot =3D virXMLPropString(node, "slot"); g_autofree char *function =3D virXMLPropString(node, "function"); - g_autofree char *multi =3D virXMLPropString(node, "multifunction"); =20 memset(addr, 0, sizeof(*addr)); =20 @@ -246,16 +245,9 @@ virPCIDeviceAddressParseXML(xmlNodePtr node, return -1; } =20 - if (multi) { - int value; - if ((value =3D virTristateSwitchTypeFromString(multi)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Unknown value '%s' for
'multifunct= ion' attribute"), - multi); - return -1; - } - addr->multi =3D value; - } + if (virXMLPropTristateSwitch(node, "multifunction", false, &addr->mult= i) < 0) + return -1; + if (!virPCIDeviceAddressIsEmpty(addr) && !virPCIDeviceAddressIsValid(a= ddr, true)) return -1; =20 --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169909; cv=none; d=zohomail.com; s=zohoarc; b=On6kXW0YZ/GdUzYlA2mWVbBGynLGMfBQcAH+TyuSC+JFVcb08XOZKVfxjXD3o+CdRkRRLKK2pd0yhMnX7JcMjyAFRAs/YHpY9qJCS9NZF2ao+TvbZN/e1VFLRMAIANINqiezkRb6sHBPUjHtawKUfipHHbqDfUUrR07n0XbxnuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169909; 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=AO52jDsqIkQ0YZsR9n9LTq34sfvBVPZS6XQI1NKhYig=; b=HUOvsurEMTm9PSOccUZg8YTTuR/J7vWLAMqkhODsKAzGVM9B1oJLqNq0kcMI74xUaslZXt71/Pg2l2sIFKWKEANfYkrfjc4AbT5nbWlEugAs1MZrtlTyeYztkk9XPq5zv2/wdLSg+x5YV26gkfsWIHEj0tcBsoqz5s38Fhq3Q5w= 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 1616169909710314.4492698090562; Fri, 19 Mar 2021 09:05:09 -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-211-dkz07HjZNBSKAX4qML1goA-1; Fri, 19 Mar 2021 12:05:05 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8ABBA9CC39; Fri, 19 Mar 2021 16:04:58 +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 C93095C237; Fri, 19 Mar 2021 16:04:56 +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 618B71809C84; Fri, 19 Mar 2021 16:04:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0FDd007648 for ; Fri, 19 Mar 2021 12:00:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 15DA71C947; Fri, 19 Mar 2021 16:00:15 +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 5908916E3A; Fri, 19 Mar 2021 16:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169907; 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=AO52jDsqIkQ0YZsR9n9LTq34sfvBVPZS6XQI1NKhYig=; b=Z5LUysxQZxfraSNPpG4AyZKTJrtPj7ey9SVbkDRYPvHYwc7oDrYaAKGgNLv1sJAncFRVKc KgSzHFPw9/Ao/IPfJQGOT88ohxvnoQ8kj7sIolKGFFeca5mRMgQknbS1UoryYd488rYEf6 40ZW7mt5Pgiu0rq8sQL81TQIZed2cYg= X-MC-Unique: dkz07HjZNBSKAX4qML1goA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 48/51] network_conf: Use virXMLPropTristateXXX in virNetworkForwardNatDefParseXML Date: Fri, 19 Mar 2021 16:57:45 +0100 Message-Id: <20210319155748.680146-49-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.16 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 Reviewed-by: Michal Privoznik --- src/conf/network_conf.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 4cf4aa4840..bbd18ba163 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -1321,7 +1321,6 @@ virNetworkForwardNatDefParseXML(const char *networkNa= me, g_autofree xmlNodePtr *natPortNodes =3D NULL; g_autofree char *addrStart =3D NULL; g_autofree char *addrEnd =3D NULL; - g_autofree char *ipv6 =3D NULL; VIR_XPATH_NODE_AUTORESTORE(ctxt) =20 ctxt->node =3D node; @@ -1333,18 +1332,8 @@ virNetworkForwardNatDefParseXML(const char *networkN= ame, return -1; } =20 - ipv6 =3D virXMLPropString(node, "ipv6"); - if (ipv6) { - int natIPv6; - if ((natIPv6 =3D virTristateBoolTypeFromString(ipv6)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid ipv6 setting '%s' " - "in network '%s' NAT"), - ipv6, networkName); - return -1; - } - def->natIPv6 =3D natIPv6; - } + if (virXMLPropTristateBool(node, "ipv6", false, &def->natIPv6) < 0) + return -1; =20 /* addresses for SNAT */ nNatAddrs =3D virXPathNodeSet("./address", ctxt, &natAddrNodes); --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169776; cv=none; d=zohomail.com; s=zohoarc; b=SAHfBB3IF/FcDg5u3ylGyy+BxSUc5e7vFnTcQ9kR8XqtM0sF7y4RJb2+X0Wu/qJbhnSW8MIWR9H2BJPpzXvcDvEw99xMtJkPrN7CIw4FB379XhWMH+sTgXd6n8ImG0W7BvX9sWz49Hl+AZtDBqTniuw+0DI8OeCzQHAOTWybHUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169776; 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=Uerb2WVMKg1ZlVyDU2VBUMY4LimCBZUu/TJNcUf7pJ0=; b=WmuMyuyKlbpnfnxDp73n74RfDcyfbESMgp4UnsOh6NaxZeQ/b/TRKF9vK4WTbQPpJIomhogY7ZyMBvRgA1qKrkbZZQ/PlSsWDFIZJ/AKx09v6jxVcrsnbV0hmY7V9yjtLOlhRJUIw+VJzmJTPZkNa0FfwW3w2QyU2c0TbotI0hU= 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 1616169776868885.4706026320913; Fri, 19 Mar 2021 09:02:56 -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-143-yG1yGo8jNLO-qr9Cz_IIqA-1; Fri, 19 Mar 2021 12:02:32 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B0C82180FCA0; Fri, 19 Mar 2021 16:02:25 +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 7DB3E10013D6; Fri, 19 Mar 2021 16:02:25 +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 17EE25003A; Fri, 19 Mar 2021 16:02:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0GLr007687 for ; Fri, 19 Mar 2021 12:00:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3271918E4B; Fri, 19 Mar 2021 16:00:16 +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 7491E1A86F; Fri, 19 Mar 2021 16:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169755; 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=Uerb2WVMKg1ZlVyDU2VBUMY4LimCBZUu/TJNcUf7pJ0=; b=RNklPSSl8J0oWfT9lnZORdPpzL3cHjTtea/5EXZWoxo91noVNeLfrADsm8q0XEtis9Qcub RaJq+GjVX2B02n2Zf8mBFOIgUR57ZcdclMwt/7cUQBlntDoph0n6cnTCipSA2dqcUhU9dg lGKdIkXHmpMumNk184TDCT9758R1ygE= X-MC-Unique: yG1yGo8jNLO-qr9Cz_IIqA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 49/51] numa_conf: Use virXMLPropTristateXXX in virDomainNumaDefParseXML Date: Fri, 19 Mar 2021 16:57:46 +0100 Message-Id: <20210319155748.680146-50-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/numa_conf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c index 64b93fd7d1..2555eeaef9 100644 --- a/src/conf/numa_conf.c +++ b/src/conf/numa_conf.c @@ -1079,17 +1079,9 @@ virDomainNumaDefParseXML(virDomainNumaPtr def, VIR_FREE(tmp); } =20 - if ((tmp =3D virXMLPropString(nodes[i], "discard"))) { - if ((rc =3D virTristateBoolTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Invalid 'discard' attribute value '%s'"), - tmp); - goto cleanup; - } - - def->mem_nodes[cur_cell].discard =3D rc; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(nodes[i], "discard", false, + &def->mem_nodes[cur_cell].discard) < 0) + goto cleanup; =20 /* Parse NUMA distances info */ if (virDomainNumaDefNodeDistanceParseXML(def, ctxt, cur_cell) < 0) --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 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=1616169914; cv=none; d=zohomail.com; s=zohoarc; b=WsOTZzPk71X+zx7yTrBD50Rf+O3WAj5b9k3A2N60xiVmgYOM/lfvdAGDZPmGHnm1qwAW520Z6lrZcEz5ohTkoDOejuZg7dt/jSBVfLwv8xS5Lz8Wcl6xiGgEAyVuIn3V9koj7RU0F9a3pRZqILreto26wCmEnkqcxZKzhmg1ZDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169914; 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=hMMyVAJtMlABdWtwwFi18jO++k+hDOL/Vq38Yo3GfZo=; b=WV5GLCFa94xf1qdD3Z59guIGa4g+GFcjAW+LShkMm7CqqXSOcZEyVF50FZ6h0gd6hJktVAHQpTvPKVoWp79FWekc+HnzOR6+9GHPGhnsMi2lKBsggraJdPi3Z3B9R5T4hPbdUURhZR2AUF1Yg1NNv0ZO6uokaGi8pNTT/41Qofc= 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 1616169914386138.69818623310084; Fri, 19 Mar 2021 09:05:14 -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-512-y_ITl3DuPCSdwS3Lv13yQw-1; Fri, 19 Mar 2021 12:05:10 -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 DA8FA107ACCD; Fri, 19 Mar 2021 16:05:04 +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 AF7852923C; Fri, 19 Mar 2021 16:05:04 +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 1E79950038; Fri, 19 Mar 2021 16:05:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0HjL007717 for ; Fri, 19 Mar 2021 12:00:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id 78F3D1F475; Fri, 19 Mar 2021 16:00:17 +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 962561A353; Fri, 19 Mar 2021 16:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169912; 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=hMMyVAJtMlABdWtwwFi18jO++k+hDOL/Vq38Yo3GfZo=; b=Msw4ZuREY3ycqYMG7ZgWK4NrZC4hnoCi/RydVdIu0FrGLhZubnoGzlekxDhODJ5NgyqMGO zuwDigthPdE0mXx55ixjUwBb0LlpHeMwrGOVhIInnWPJn7aF/f0VPcUN6+jh0ArnQLRdKA WXlzrPrVGlrwxSi90JyOcUrJZtX0Tkw= X-MC-Unique: y_ITl3DuPCSdwS3Lv13yQw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 50/51] storage_adapter_conf: Use virXMLPropTristateXXX in virStorageAdapterParseXMLFCHost Date: Fri, 19 Mar 2021 16:57:47 +0100 Message-Id: <20210319155748.680146-51-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.14 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 Reviewed-by: Michal Privoznik --- src/conf/storage_adapter_conf.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/conf/storage_adapter_conf.c b/src/conf/storage_adapter_con= f.c index 69062b4b58..a19920c8b2 100644 --- a/src/conf/storage_adapter_conf.c +++ b/src/conf/storage_adapter_conf.c @@ -64,28 +64,16 @@ static int virStorageAdapterParseXMLFCHost(xmlNodePtr node, virStorageAdapterFCHostPtr fchost) { - char *managed =3D NULL; + if (virXMLPropTristateBool(node, "managed", false, &fchost->managed) <= 0) + return -1; =20 fchost->parent =3D virXMLPropString(node, "parent"); - if ((managed =3D virXMLPropString(node, "managed"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(managed)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown fc_host managed setting '%s'"), - managed); - VIR_FREE(managed); - return -1; - } - fchost->managed =3D value; - } - fchost->parent_wwnn =3D virXMLPropString(node, "parent_wwnn"); fchost->parent_wwpn =3D virXMLPropString(node, "parent_wwpn"); fchost->parent_fabric_wwn =3D virXMLPropString(node, "parent_fabric_ww= n"); fchost->wwpn =3D virXMLPropString(node, "wwpn"); fchost->wwnn =3D virXMLPropString(node, "wwnn"); =20 - VIR_FREE(managed); return 0; } =20 --=20 2.26.2 From nobody Mon Apr 29 09:07:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1616169919; cv=none; d=zohomail.com; s=zohoarc; b=VGbpEQ+dQr9AxmllcqE5jX7HYJteEFea4h8ES43pQ29nmLzQX+kQu/I3TpZqDeVUelF+Wk0KKMp3GbGXPY0/Vg7+MqW16Wf/Fa/eCJDmw+EjshJmgdxzIIWfad5Qqx9ykqSnr+hRqFgXKkps/poUY68K+lM+rO9IgxJhABUa2DI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169919; 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=+zlU2Qh73oI3EsTyVHnnHFvJQNXDVdtl0Tlwy63x2gQ=; b=TZO9PZ28bb6PaBauMxOejP8+f+DGYRLLLGyxrrLw2NafaWenzlEKjIUJqkTnDMvxMOjz+OuK8PH7uGY2HGG6LXZJ1NYN6xNe1fse2Q/4Wmxbc88gdqKb7K7lfmDS3TyNb7a53TWZ5DNwt6YICSqWB/EJvV5RObvCB+kwk7X7+tk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1616169919485643.8530939434701; Fri, 19 Mar 2021 09:05: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-96-E5XcRMnwOgefiai_4HgvLw-1; Fri, 19 Mar 2021 12:05:15 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 389AE83DD20; Fri, 19 Mar 2021 16:05:09 +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 E67F710023AC; Fri, 19 Mar 2021 16:05:08 +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 7FEE91809C83; Fri, 19 Mar 2021 16:05:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0I2q007756 for ; Fri, 19 Mar 2021 12:00:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 744CE18E4B; Fri, 19 Mar 2021 16:00:18 +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 B67A41C947; Fri, 19 Mar 2021 16:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169917; 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=+zlU2Qh73oI3EsTyVHnnHFvJQNXDVdtl0Tlwy63x2gQ=; b=Lsozd+Goa4C2foQ5kj7tXw7f447PeG+aIo2wHKlwWHt5w130Odc0JOK5RobEWC/5oMCzk5 z+bx8ZYD4rEgEtsI18qMzVBjRsFWSIQ7UiK2CeQMnjHReDj7FsKhlvf3Jyc/tbZD+glYgG zu8RioeTfZxGbropmN4t8ds6XkBeWUM= X-MC-Unique: E5XcRMnwOgefiai_4HgvLw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 51/51] storage_conf: Use virXMLPropTristateXXX in virStoragePoolDefParseSource Date: Fri, 19 Mar 2021 16:57:48 +0100 Message-Id: <20210319155748.680146-52-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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.22 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 Reviewed-by: Michal Privoznik --- src/conf/storage_conf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 6116b04d44..286cdf105d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -605,7 +605,6 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, goto cleanup; =20 for (i =3D 0; i < nsource; i++) { - g_autofree char *partsep =3D NULL; virStoragePoolSourceDevice dev =3D { .path =3D NULL }; dev.path =3D virXMLPropString(nodeset[i], "path"); =20 @@ -615,17 +614,10 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, goto cleanup; } =20 - partsep =3D virXMLPropString(nodeset[i], "part_separator"); - if (partsep) { - int value =3D virTristateBoolTypeFromString(partsep); - if (value <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid part_separator setting '%s'"), - partsep); - virStoragePoolSourceDeviceClear(&dev); - goto cleanup; - } - dev.part_separator =3D value; + if (virXMLPropTristateBool(nodeset[i], "part_separator", false, + &dev.part_separator) < 0) { + virStoragePoolSourceDeviceClear(&dev); + goto cleanup; } =20 if (VIR_APPEND_ELEMENT(source->devices, source->ndevice, dev) < 0)= { --=20 2.26.2