From nobody Tue Apr 30 19:40:33 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=1616161326; cv=none; d=zohomail.com; s=zohoarc; b=Dn/PPqdG/A/K+iyKpCBP8uR+q4CbQOJuzrtxmjRtwbVKSxeBTnhQcK3IaSTSDtiOH8k0S/PU2pULLavqVynN6EXLH8vJ482mh49Zx1ekzmr6mnQ060j/ZS1EFRv1pPAqBUz3RjeOdQOLX6FGoRmF9ZmU9fwrlUvODO8b5Nm1i/0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161326; 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=Eh+Qq0sRG6/CdbNAYlc2HrsD/hGdZIxU9HDjJ+jUiYM=; b=WRNIt7uy6mXyy6NvDxLUrYaIXpnxIiIXZO8YuIIvd2JuHFlpfw/40gUOyXUfbRnjmAAOEOuHC6yZW1LN714NHWXa4CAmaQvSONkEXOF9nF1WQMP9dOKV0FVpAWvJHHX8q46uICDuNhqVzeylfFaaWGZFxBXLDiavmKvydeBLhSA= 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 1616161326551819.3958639668401; Fri, 19 Mar 2021 06:42: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-511-ZX3_FKxBNSiiKpZ7WqXwzw-1; Fri, 19 Mar 2021 09:41:32 -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 D6BC883DD20; Fri, 19 Mar 2021 13:41:25 +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 A3BEB5D730; Fri, 19 Mar 2021 13:41: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 53EB6180B450; Fri, 19 Mar 2021 13:41:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfBZ1018917 for ; Fri, 19 Mar 2021 09:41:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id 308AA2BFE2; Fri, 19 Mar 2021 13:41: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 7496663B8C; Fri, 19 Mar 2021 13:41:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161325; 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=Eh+Qq0sRG6/CdbNAYlc2HrsD/hGdZIxU9HDjJ+jUiYM=; b=EurFv//Yj2xEkYfIU80AoktmpLvvwsqba4UoU8wi+LQaFtWT4A5wgqAmcfJZdywsxuVoHj lx56kCjzfxChu58TdWvKdgryfn7FJZCAfYxcehET2JMeYKMTbE22LpbVzl1X8MWt6qZ3eJ ptcM3yYzqVVHQy5c3WP28fS1V8+9JpE= X-MC-Unique: ZX3_FKxBNSiiKpZ7WqXwzw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 01/51] conf: Use virTristateXXX in virStorageSource Date: Fri, 19 Mar 2021 14:40:15 +0100 Message-Id: <20210319134105.442774-2-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/storage_source_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Tue Apr 30 19:40:33 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=1616161288; cv=none; d=zohomail.com; s=zohoarc; b=mVG+tJTe9C8fK+Ubi6WMwX19jpDfldkqtenJRSjsep7klgeCxdmnnM9Ygm5H4mbYvMw5EZO6TsfX2qmxuj+zryhzbkjyRi2XCQARpaUGr2Pg6p4tZdWIDdQxgVf25ak0SmH9oaoTidIhcEBxDeOe9M04ocmzcHtykkHL+MNBZFc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161288; 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=TQhDrZLLWVq1RpILw4jZHHv04a1qMP5lUsFGN60eTyQ=; b=H6yCRn5QK6OS27fLpjhths039BoM9mZeq4BGs1vZemvMz219/llQcel7CeMKobT25lUUPL0xM9UBhNJh786blkur9orJfiGYnakZO+h0BwqxW9aGv/5sgx/oKeL041eSSC/sNnAqnuO2d5q7YdrHOySHLQ6vhNPV2ARnOK3Mq1U= 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 1616161288984858.9863140701057; Fri, 19 Mar 2021 06:41:28 -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-189-D5D_pgA4N9-vXmeqNav6pw-1; Fri, 19 Mar 2021 09:41: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 E77B483DD20; Fri, 19 Mar 2021 13:41: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 D300B610F3; Fri, 19 Mar 2021 13:41: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 47F984BB7C; Fri, 19 Mar 2021 13:41:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfClF018929 for ; Fri, 19 Mar 2021 09:41:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3F0A8369A; Fri, 19 Mar 2021 13:41: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 81C9163B8C; Fri, 19 Mar 2021 13:41:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161287; 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=TQhDrZLLWVq1RpILw4jZHHv04a1qMP5lUsFGN60eTyQ=; b=K3TwtHaWzgwQ/VrlFxxZxLpgOwQ6TzCOH6pyCiTP5Z8wJthMHh47ZnEK2yaWTqhIx6zsmx PU1IKiPwujj+A72kR+cFTOzceNQPxqvF76qOTuZiTXtj9HnYWzniTvOlXf/Sdnns/a4cha tjILSmy2XNVN62mhIjiUXXpvY6u3C20= X-MC-Unique: D5D_pgA4N9-vXmeqNav6pw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 02/51] conf: Use virTristateXXX in virStorageSourceNVMeDef Date: Fri, 19 Mar 2021 14:40:16 +0100 Message-Id: <20210319134105.442774-3-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/storage_source_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Tue Apr 30 19:40:33 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=1616161289; cv=none; d=zohomail.com; s=zohoarc; b=a9kkzcbfHTDQohdlNdBziQE382OD3sfCZ55fiYxTcxfhQuZrmj5nnb7zLIKJCWFeGu9w5pq2QXONhiDuCf1GdZdRqsDrWybBSO5/h0GJtPLD7/4nE1w8yG7HNMykyEdNjNMUGO/FBynhWKYweXDpeetXLIiH849FVpmDv9BGxwE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161289; 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=MWCYwadtBklBL1yTTZc9xhvHB4gHEJPNJ3OTGGrN+VQ=; b=Qvqzle2pkx55xuLIBOY6mb8hpm44n4zh3Hl5GoUd2lQPeu39yNRhCp2FQtj89ew/ZmXnTOcWtDUDkTQ67uOaZAATpX7F9jjcKSClBJXLzuBUtCttyArcaGr5Fqa2PsGKU4mem6ApLdGcC3qstgDjFjXG7dLR2GVuuqloKFO7FEM= 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 1616161289012969.7070837095092; Fri, 19 Mar 2021 06:41: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-179-En1HltzONUmIpy_5qftQHQ-1; Fri, 19 Mar 2021 09:41:24 -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 0540E83DD28; Fri, 19 Mar 2021 13:41:18 +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 D03474F3C6; Fri, 19 Mar 2021 13:41: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 E95314A7CA; Fri, 19 Mar 2021 13:41:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfDsO018936 for ; Fri, 19 Mar 2021 09:41:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4B5D1369A; Fri, 19 Mar 2021 13:41:13 +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 905CA63B8C; Fri, 19 Mar 2021 13:41:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161287; 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=MWCYwadtBklBL1yTTZc9xhvHB4gHEJPNJ3OTGGrN+VQ=; b=fPqIEZpcJT0KFMQkq6Hd7Kp4KpjhgLZTfw1Y2XVT+kQMcd/4wU5Rr67zQDCuaLJTVH0qTg 1j/uA1YLFLL9CmQ8dTKrLCpK89LrmjnZ/ZXLdVtp14NJLhNDaARnU8E2J4HEayk+ykKOsD 4KSWvKXVVIkS4JcQzj/HwKgsM1Hcb0Q= X-MC-Unique: En1HltzONUmIpy_5qftQHQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 03/51] conf: Use virTristateXXX in virDomainDeviceInfo Date: Fri, 19 Mar 2021 14:40:17 +0100 Message-Id: <20210319134105.442774-4-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/device_conf.h | 4 ++-- src/qemu/qemu_command.c | 3 ++- src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 5 insertions(+), 4 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/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 Tue Apr 30 19:40:33 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=1616161300; cv=none; d=zohomail.com; s=zohoarc; b=d4Vk69UoyC6IDaQ8RptpgWW/Dj9LoBMHz6vjlbjAsjbu6Vsie2LPdBLBGr94Ah9Cr1FUDVtKyHKQYpYnmjC+8SN8JCYbYhCBLyR1mxqDiO/azTMGrhUpxbQDSbySmUFJOZ7vZn0DufdtgfCptlU2u6Zl2HnLspOb5rmNdKCPXog= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161300; 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=pS0KHXYr45WYwUie4vmkjHNfCEdUPPHze60ABLUHoVc=; b=SAkShkS5ETnlFysoOCtwBRFarkPuNp53cH9bkc8Igecvzs8xI5Ic4txTR/iq7oC89RCxixDSSKL+4qg5yswXOCjSrDdGLGFvSBVzc0TSJL72mfTzNS01TisdJqVv6YfDpZz5ur+H8U/kYb6bQ1ZSw24TUu39IOBxG3iCx/51s5Q= 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 1616161299910983.667675035827; Fri, 19 Mar 2021 06:41: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-422-1enaZ5jBNSKw5qG7_Pr2cQ-1; Fri, 19 Mar 2021 09:41:35 -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 C9E7983DD30; Fri, 19 Mar 2021 13:41: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 9EBE310016DB; Fri, 19 Mar 2021 13:41: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 395984A707; Fri, 19 Mar 2021 13:41:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfEWs018945 for ; Fri, 19 Mar 2021 09:41:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id 57540369A; Fri, 19 Mar 2021 13:41: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 9D2BA63B8C; Fri, 19 Mar 2021 13:41:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161297; 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=pS0KHXYr45WYwUie4vmkjHNfCEdUPPHze60ABLUHoVc=; b=Aomx/1nHPI+Q6m2iJLQuIJLvYJCnO5RoTf4rK4JKRx/27I4MzwCl1vymQwxdooZxinUoKN KEIdwwNbWsMOBrPrviWWlfN5h0N/47chRDb7Oh5pLTOxCZ9SjO5FJetf4jNa8Efi9rxCTq Sfnlu10lPsH/+cK2sxB1r6vdlVcW1nU= X-MC-Unique: 1enaZ5jBNSKw5qG7_Pr2cQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 04/51] conf: Use virTristateXXX in virDomainDiskDef Date: Fri, 19 Mar 2021 14:40:18 +0100 Message-Id: <20210319134105.442774-5-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.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 --- src/conf/domain_conf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 Tue Apr 30 19:40:33 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=1616161339; cv=none; d=zohomail.com; s=zohoarc; b=chlu9+xhGK/qGz5jUvuuYolq+RDFbcBjQ4qydBHrk+QaguBcHo3BEbQkV0T/HU6wshalNraLy2Ux+CSh1M1EE1jCgVdXj4YYm4wOtM8rvf3qWtfaRMmyQ1FKEgbGiXzTsDPYLwVE4DgC/4GGR6MLU44YkS0RJLxH6Fyqucs3UOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161339; 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=ogc2oaa0UuWej8pUkadmQ52joHx5xHZSbE2ZUWfT9+w=; b=YZb3hZLKFFMeaejTMZxirXW5BWzbPEkqfj6BNGKjNPzIzk0Ud1TBPE5yFaSss2Z2tVv5NabLBtGXv+CV777VnRoYP6zP9KaiJd5Bl5EoGKm6haoHC/ZJJbqDUE7cfLfQOqLnWUUt1O5Q7xEAgM0fGX2i0Z6zEuwMg2m34E+tMiY= 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 1616161339302224.26896452542712; Fri, 19 Mar 2021 06:42: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-231-um0n0WvAPYmidY_2LGC-0w-1; Fri, 19 Mar 2021 09:41:39 -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 C8AA7190A7AC; Fri, 19 Mar 2021 13:41:32 +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 A16985E1B5; Fri, 19 Mar 2021 13:41:32 +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 5553C180BADC; Fri, 19 Mar 2021 13:41:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfFZu018960 for ; Fri, 19 Mar 2021 09:41:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6872E179B3; Fri, 19 Mar 2021 13:41: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 AD26563B8C; Fri, 19 Mar 2021 13:41:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161338; 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=ogc2oaa0UuWej8pUkadmQ52joHx5xHZSbE2ZUWfT9+w=; b=dDPnVypeBiPa4rGbxd3rcch5TXr0y1oo60enNhL3abgsqOplqcCow5OUjhoTWdgZ8idGI8 mfV8JiGFkUpdUiqQ51EoND7PJgkgfEq668xsMfl2Y6kDwZTOQbSjmaVMXn2kpt2dZmmjoK pZWqRN+WG1WZY2D9KuVfAFR1F2TzP2k= X-MC-Unique: um0n0WvAPYmidY_2LGC-0w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 05/51] conf: Use virTristateXXX in virDomainActualNetDef Date: Fri, 19 Mar 2021 14:40:19 +0100 Message-Id: <20210319134105.442774-6-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 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 Tue Apr 30 19:40:33 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=1616161309; cv=none; d=zohomail.com; s=zohoarc; b=hARPRddNr1DbNOg8W2bhc/A+AeJOu8nbXZc4uUKL9eHco55L+FrXw6kFVk2UgHaeB/rFBDy8tpZj0c+dg0HnrGIcU45TNsGYRodCmvPBBnKpTiuOBhQNSY9IdE8yHmJZkpAUQ4OuzFAXgqr7Egeqn6t91ZLs/x6yx7cYSok6UIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161309; 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=ejjoG9q+RhXxR42a17QLWRwAOf3aKIe6E7Ov8ifWjsI=; b=loC3Ky+xX1P6bQtEKC2fAAk/HEcYFKmmugDPdRynIs7rL5ICN0W/MWMuYFZ3LUeD/dE7rVBdus8booy8c5wuH9ZBaY3EU+C2G5Ybm4m9FPm1mYzNwsSdrMZSc5/k/AY0pR8AdXdtakKvET8XeEK+YJ9RvPnhYyI0AMCjvmGh0/o= 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 1616161309473398.7665190197697; Fri, 19 Mar 2021 06:41:49 -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-7-N0srp5lbOI-bubQiALjHdw-1; Fri, 19 Mar 2021 09:41:44 -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 6B67E83DD23; Fri, 19 Mar 2021 13:41:36 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 443566091B; Fri, 19 Mar 2021 13:41: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 C45984A70A; Fri, 19 Mar 2021 13:41:35 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfGWY018969 for ; Fri, 19 Mar 2021 09:41:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 85DF7369A; Fri, 19 Mar 2021 13:41: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 BE81C189C7; Fri, 19 Mar 2021 13:41:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161308; 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=ejjoG9q+RhXxR42a17QLWRwAOf3aKIe6E7Ov8ifWjsI=; b=bXsSe9qGtmfeBMD6fkmq7Gr0mof0mLU/NTDXhdvbDqGyaBuFKfXVT6fBPRXYu/NYHumKXJ KhY3WSPZ97g+Pn2KfysWRwQ0biBieCcUpK1ZndhCEHiU5DrY4Xr6gWLTHsEKyJxI7+4erx +RvUf/qbChfkXzmbwLaAEpeoO8UqwVA= X-MC-Unique: N0srp5lbOI-bubQiALjHdw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 06/51] conf: Use virTristateXXX in virDomainNetDef Date: Fri, 19 Mar 2021 14:40:20 +0100 Message-Id: <20210319134105.442774-7-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Tue Apr 30 19:40:33 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=1616161296; cv=none; d=zohomail.com; s=zohoarc; b=lo0oXY4Tr3qxUsHHhDJTUSbFaQBKBwkrN8B0fsY+AgTZkzdv0DIw14/y+7iMcbpA62CU7FqUxVGAqgrp7pF6wHOdqYL8Gw6xu4JzbwuIhLMyw6LOeeK2QqQ5nnugVi4K+gh2fFW0fIixOLBoSlARtyqWdj0Fmb3xx30hNkI+jcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161296; 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=YalSBpheLbfZAd36qlB4BY+3q24dB7m3ak4E+RsLbrg=; b=iuYTYYz1VnkXNwQ4Rj9lcCVZ7arU44QaZkvaejLEluj7yp1MieyOIj+4/Ka3jAeNc2i09g1WKihLV6L8oB71q4YcOlc/BjuKe2g7tt1J9yGkBMKag1cp6jjPZeXR+HPJolQcRbg6nNexzKTXGKXZqVEIci97in5gwesf+kzoq2o= 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 16161612960231006.1789518470788; Fri, 19 Mar 2021 06:41:36 -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-0EJg6qVIPLyY72CJnDme6w-1; Fri, 19 Mar 2021 09:41: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 6CB3083DD23; Fri, 19 Mar 2021 13:41: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 3BE0910016DB; Fri, 19 Mar 2021 13:41:26 +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 A1B4B1800662; Fri, 19 Mar 2021 13:41:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfK7Y019004 for ; Fri, 19 Mar 2021 09:41:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5F411369A; Fri, 19 Mar 2021 13:41: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 A2AB9189B6; Fri, 19 Mar 2021 13:41:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161295; 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=YalSBpheLbfZAd36qlB4BY+3q24dB7m3ak4E+RsLbrg=; b=FvHxW30BX17TlBwfwQtrwqaOy5o+EKl7viFcA6nTWX+T/+W4FtX4Q5nRfBmQYnP8PfihvH iIukzzrCoPFxiJ6GaCa9+QvkanVwRJiD+iC/h6E4eQarrR1uhhDQ/ekYsPHMITpptqCemX Nr4pw5iV3BWIf2H3onuTT/aUMx1NW0c= X-MC-Unique: 0EJg6qVIPLyY72CJnDme6w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 07/51] conf: Use virTristateXXX in virDomainChrSourceDef Date: Fri, 19 Mar 2021 14:40:21 +0100 Message-Id: <20210319134105.442774-8-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.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 --- src/conf/domain_conf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 Tue Apr 30 19:40:33 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=1616161324; cv=none; d=zohomail.com; s=zohoarc; b=WFNgM8UZR+HY0+imlrK6fpoq+ryBGkLpfMij4wC8zr7ar5cn4OsGrbVODBaknueqFnvvnAcBVIHTA+q8I5E20LGf1XcaVCN32Z/RPzXV4DxUio7WpJGO7CSDi+FgiScYlyyXvThj6gBeq1wNCq7QbmnZ1yAaXHam9xnmdf1Qcsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161324; 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=GkmUkWKmGgBTsEkkQkcSrKZq+eRnGqJXfdSvQi6Df331qFNZKsQRUuQW4ihAAurBmFbeY+CyIXSCCM7FpfaydpJYz39pPl8faI2xR/NqxseKHvZY4CYAc/Zhx5fws1DcRnjQNvQk+xh9ntQqkY+vimLhg0Y45wghJl0t1UvIUGA= 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 1616161324899615.1997986803655; Fri, 19 Mar 2021 06:42: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-243-ulrzs_kQNxSXLPHsWYu8Jw-1; Fri, 19 Mar 2021 09:41:46 -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 E11A010866AE; Fri, 19 Mar 2021 13:41:39 +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 BA4D55C27C; Fri, 19 Mar 2021 13:41: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 7321A4A713; Fri, 19 Mar 2021 13:41:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfLB1019009 for ; Fri, 19 Mar 2021 09:41:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6C6372BFE2; Fri, 19 Mar 2021 13:41: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 B033763B8C; Fri, 19 Mar 2021 13:41:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161323; 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=dZuxVVVkGRGyXm9PcrJDk0SZmlt/PEroe9gBVqa2iWiW4a10JgeAFCBi+HqhNxUiaS2zmg cmZ2F7GOVV/vG6BpzHfu0BqKK4j67+grqVJBF+J1gqVwuLMzxGuRohiRhcwgf755MW4RH8 tG8Gm/cI/6QLdCI1Dxwz0WXlu5F8ZGY= X-MC-Unique: ulrzs_kQNxSXLPHsWYu8Jw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 08/51] conf: Use virTristateXXX in virDomainGraphicsDef Date: Fri, 19 Mar 2021 14:40:22 +0100 Message-Id: <20210319134105.442774-9-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 Tue Apr 30 19:40:33 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=1616161295; cv=none; d=zohomail.com; s=zohoarc; b=d+rGUiPmeglvhuznp6OgbAMKoR5YK8AMVE+BnDlTgTtPJnut/ifopx8WDr1MHd6SHuPvf7Ccf9Jl30S3e0UY4junqtdAPFwi3VYUEgzS7fwk9qDKu8jz1bXj5/j8u9F/+jrrEqH0EIaMPpWQyzeGCZpVQm4Rt65657B+oH5g87E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161295; 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=KOmy8y703dIfyCIY4P6X32UPDxy3eOSRHQILqDpiBTo=; b=EWMpuUZ4j8vfWYR7XeYdX8VscGsjVp22ofaJAr6bU06le3/GbsqsWAJI0RXiaotm/Pp4kzOhi3/HWIvdfgmFADN2l0YmqpOKWOevGIj86AsZwzX06cxM6XVbeuzPQ/KkF1ffBHlufs3Gg9vlnXWR2KUrRdaSl2iURSMNoMgj3xg= 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 1616161295823664.2697786480965; Fri, 19 Mar 2021 06:41: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-66-F9HTtFBIMe-ieXWUE8SKZw-1; Fri, 19 Mar 2021 09:41:32 -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 2622C81431D; Fri, 19 Mar 2021 13:41:27 +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 E5D0B19C79; Fri, 19 Mar 2021 13:41:26 +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 9D7BC4A705; Fri, 19 Mar 2021 13:41:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfMKa019019 for ; Fri, 19 Mar 2021 09:41:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7877463B8C; Fri, 19 Mar 2021 13:41: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 BD3AD189C7; Fri, 19 Mar 2021 13:41:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161294; 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=KOmy8y703dIfyCIY4P6X32UPDxy3eOSRHQILqDpiBTo=; b=LGl4EG0aatNm2VMA8+wKw//ThwQojGsHJXM99ARGjNIHadKFTmoDKoF5sudUY0VyvxStLa dIWGpEIlQ9Cq7/oDR4Do84wySxtyaZeZ4iZO3rVzrhuADWP8dLFS6KuP0jxMRWDvm5gcTs Y3ftQoDWuecnQAf3MMnu2YxP+FgfJT0= X-MC-Unique: F9HTtFBIMe-ieXWUE8SKZw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 09/51] conf: Use virTristateXXX in virDomainMemballoonDef Date: Fri, 19 Mar 2021 14:40:23 +0100 Message-Id: <20210319134105.442774-10-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 Tue Apr 30 19:40:33 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=1616161301; cv=none; d=zohomail.com; s=zohoarc; b=WQxEoLNiutxfATv8yIg64C0gme7JJawRA+FA9vgVFC1uJH2p+k2MdJ/NyI0SvKUKNZvIYtGngdjilMBQEmOmHfyEORmklCi209nG6dxFeG1iMb8oJVWxIDOu8vdgvarmHYYBTTmtog9PCWx59936BMyG/RAP72D35r3RfUVN3Yk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161301; 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=s7uU7667zBTWtUdypUM1ej4vl97A0+CtYmlQqg79GMU=; b=aWZSNaLGRs5aQT47sGYGcpgwNXYy+xNwFYKsr8WfwXO5QU5My+a93zHkYbP1fdeu4usUOHBXoocV1cZ/NMXw/BIXAHzwf+pdidXE6UC62R266SRkFmiu4Og8lgs3OsHP4+O/gXSqEdBM+VJk7n9Qv0uN7nZhBnfMgMsyPwfrnb8= 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 161616130102879.79418388267914; Fri, 19 Mar 2021 06:41:41 -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-339-nru0PPL3Nraa2C66fB8NuA-1; Fri, 19 Mar 2021 09:41:36 -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 086E110866B0; Fri, 19 Mar 2021 13:41:30 +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 D76B95DAA5; Fri, 19 Mar 2021 13:41: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 9A8B4180B451; Fri, 19 Mar 2021 13:41:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfNO3019039 for ; Fri, 19 Mar 2021 09:41:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C31D2BFEE; Fri, 19 Mar 2021 13:41:23 +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 CB8C7189C7; Fri, 19 Mar 2021 13:41:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161298; 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=s7uU7667zBTWtUdypUM1ej4vl97A0+CtYmlQqg79GMU=; b=Hk5YCdqlgopqjU7zBVGFt5FXkMVTSPpNNKANVhCIAHpzPuWIT4EBibmLOKPzRHyeq3VphU 9J43f+Std4mWkUH85ZEmbXEr15ITV1TeNo7BvAOa5YWHDRFFC97VGcaZbVvmKRPs8gA+G0 +lAqG7M4sDwkDEL6WlGAZ3YWpaNsbXE= X-MC-Unique: nru0PPL3Nraa2C66fB8NuA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 10/51] conf: Use virTristateXXX in virDomainLoaderDef Date: Fri, 19 Mar 2021 14:40:24 +0100 Message-Id: <20210319134105.442774-11-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/domain_conf.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 Tue Apr 30 19:40:33 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=1616161327; cv=none; d=zohomail.com; s=zohoarc; b=aYBteeZmX1R0jBGBCQP+cj7cTgwmD475MKla2+CIH0ZaZTiiU78s1SPEUs2vJ3JOlJqaf59DZIB0KmccsVcTAgT578Xnqa1i0hw4WQhhsCxqxsfYyJ+zNI9fWVQzigZ40p8zkm/vEyg13t7AUj21CMdM8O6vELyqICwrglYtSg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161327; 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=emTD5/j0jC5KYPaI81mUROw8YiCA/cU08UICycQhBvfAiByTrXBgoNMuYY8ohpQIiLzgGvGS3BV7A+OtEGiA9dmw17puxr+eFyZ5cZsuElmEJVDB5LTPPUafFwOURx3yRM/n5B1MoIsr3oQpHjU1y2A01yz0LwjqbbiBp4WGAbQ= 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 1616161327390379.98314401594155; Fri, 19 Mar 2021 06:42: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-14-3Z_8w6aINjOS6TU22yJ3ig-1; Fri, 19 Mar 2021 09:41:39 -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 64D6A10866AD; Fri, 19 Mar 2021 13:41:33 +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 3C7B75C27C; Fri, 19 Mar 2021 13:41: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 D4A931802138; Fri, 19 Mar 2021 13:41:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfOcl019065 for ; Fri, 19 Mar 2021 09:41:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 998D52BFE2; Fri, 19 Mar 2021 13:41:24 +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 DBA1263B8C; Fri, 19 Mar 2021 13:41:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161326; 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=MwMZYDZn4GnI9HQXyw6IbfMKW4zWm5LOAQOd9XSpTlcjfrKDo0l+IMrnQo7OX9w8SUKU5p uxyB3Oh1vfFGLBJPNHbVW66nx+FyfIDOdZqvS+8lTNGD0RD4yRjR/08qTZaHC1TIrY83AS 3ARC5x3tV0sGsUjZJmoqiGc5YcUjrGc= X-MC-Unique: 3Z_8w6aINjOS6TU22yJ3ig-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 11/51] conf: Use virTristateXXX in virDomainDef Date: Fri, 19 Mar 2021 14:40:25 +0100 Message-Id: <20210319134105.442774-12-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 Tue Apr 30 19:40:33 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=1616161312; cv=none; d=zohomail.com; s=zohoarc; b=Uv77Iu/Bdq9T1sW2AXx8eURebVghxX9eriqxrDwk4NTE4xP4aKP+AuN5/HHicu7h8Tm64LBwdyImHMp3mx2Ls5LDqeycW9KPLz7pF9OJXq1SjcxkKZbxmQUvktV46Ll105ihwiDhgEoqbPixAcmvRt64OW1tOEYBshp5uIcpCzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161312; 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=OlewrrvPhQVXMa4x1xYkYKvSKsQnUqNc80g09g8HdShNSFZE6Qi55TPghZ0Jd+YvxUgVvtNG2c53nqxL5PwbDHXZEj/7tCtGz0LgV7SiPmKBEetjBY53aGDnEXu12lhFZfXMOtnDFLsJMsm89NhcIgZN7WRvpfLJcsxSCZJNAJ0= 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 1616161312874764.2750343131609; Fri, 19 Mar 2021 06:41:52 -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-520-Wd_aelx_MIOHY_6bZFz5Xg-1; Fri, 19 Mar 2021 09:41:48 -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 EF8B9190A7B4; Fri, 19 Mar 2021 13:41:42 +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 CA5D25C27C; Fri, 19 Mar 2021 13:41:42 +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 814594A718; Fri, 19 Mar 2021 13:41:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfPr9019082 for ; Fri, 19 Mar 2021 09:41:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id A8B5E39A65; Fri, 19 Mar 2021 13:41:25 +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 ECA0F50C0A; Fri, 19 Mar 2021 13:41:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161311; 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=Xh2jF5/6ID+8Zv/X86bs+PvI1EsZLOnMIZH7KvQWPjTZUUdLvRlIAKdEX0zqSPbt6a5q/0 F++BfiCjhrMvjRasVbPsiONYuSICwMkJRASmHvrD2ewVIM0NtAhLsvoM042FeYTuleR17B Y4RQn61ljwqzYMtTbhSZmFdRUu7zHUE= X-MC-Unique: Wd_aelx_MIOHY_6bZFz5Xg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 12/51] conf: Use virTristateXXX in virStorageAdapterFCHost Date: Fri, 19 Mar 2021 14:40:26 +0100 Message-Id: <20210319134105.442774-13-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 Tue Apr 30 19:40:33 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=1616161308; cv=none; d=zohomail.com; s=zohoarc; b=NqipfWxVrouNllpM485O01y5xGOWpISF/UfAgKBdVWduO50dT6gNEuhVyfVffsqCgm18XzQi/CLnvj35P6a664knf6prAo7lUIl2UJzP5PcNOF+QJKUIRAj2q8b9+j37ld9qDf8TQZc0fukKYIscPo6m3vtjZndzPmB/K+tm0xs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161308; 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=nM/+Rq3z0zTZwyBi//5rgRxJKdxcf0yvHFMGKUZNTEU=; b=VbWjsr3/kRYZSeHfZ81UVCug3WPabjs+Jak/Lccj/xYhbn4MEFi76V4tkqfRPKRnQupKOu+e6JD+JtadeLCAVNyoRnz5pJHaKJ2YV8yMfCBTUjbS0dvBA8sJ5xtd2gimYKDoLMzmwLDVLHP8pvXV8j0S8AeHFoT5OlBb9AwHzM8= 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 1616161308143546.6186521136957; Fri, 19 Mar 2021 06:41:48 -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-U4W4bVlnNdCQfsZXddJoUw-1; Fri, 19 Mar 2021 09:41: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 18E87190A7A7; Fri, 19 Mar 2021 13:41:37 +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 E5E835D9F2; Fri, 19 Mar 2021 13:41: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 ACCD04A70E; Fri, 19 Mar 2021 13:41:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfWgb019230 for ; Fri, 19 Mar 2021 09:41:32 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9BFFD50DD2; Fri, 19 Mar 2021 13:41: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 E144C50C0A; Fri, 19 Mar 2021 13:41:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161307; 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=nM/+Rq3z0zTZwyBi//5rgRxJKdxcf0yvHFMGKUZNTEU=; b=CvsxrkeP7M6wluS8165nIk2tW0jljiI1vwMlh4L2PcWFrxczbK1BpIexDdej7r/XnFjmVm gDXrC1lH0EW5lGcqzcyBVKM74GSajtFv2zwEdPOB2waLmL3m5hVBNtni3KJh3lf2rm8d1C GrSxWVzSRZYzcWhPCjXzgB7ezOXMi7g= X-MC-Unique: U4W4bVlnNdCQfsZXddJoUw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 13/51] conf: Use virTristateXXX in virStoragePoolSourceDevice Date: Fri, 19 Mar 2021 14:40:27 +0100 Message-Id: <20210319134105.442774-14-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/storage_conf.c | 2 +- src/conf/storage_conf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 2e07c81f8a..fa8bcfb8ce 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1097,7 +1097,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 Tue Apr 30 19:40:33 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=1616161316; cv=none; d=zohomail.com; s=zohoarc; b=Dnm58GP+XG1bRa5pU+1JevZIABwH+Q1YHx1XrBQx7EFExlH+o/gXhtlfT1yZLlLa/exxhIgEtkvJ4Ln+YLruGWBm3sg8V5thun+HR3DWM8vcp35rKRpOHJRFIOkwSzAlZjSHQqNufJ55fzvtaUMRLgof6ZMZKoadd21ri47XHRw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161316; 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=PiT1u4jCRWI88OCOdbv+bRZeeqCIB4w2xlxwBpcJhns=; b=XMpctciMrNrKIBUK4yH1OSpuPa4HAeI0zAnJGbS02xQi+ij4XQMCUEL9mWPypqzJsqua3Nbno72VMOiR2nqYDcUiH1GViaMmNGjsfgFX8KXuQLa8Is2OnivzZFXXE+sqBNIOCHcRmQ/YSRUVdTvQB4+a55POPIcO+Gw1rvzcw4Q= 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 1616161316473705.3646275092989; Fri, 19 Mar 2021 06:41: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-250-ATeeDjI3OPiGji48QxXOcw-1; Fri, 19 Mar 2021 09:41:53 -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 C64E183DD2E; Fri, 19 Mar 2021 13:41:47 +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 974C75D740; Fri, 19 Mar 2021 13:41:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 386151802140; Fri, 19 Mar 2021 13:41:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfXoC019250 for ; Fri, 19 Mar 2021 09:41:33 -0400 Received: by smtp.corp.redhat.com (Postfix) id A90032BFEE; Fri, 19 Mar 2021 13:41: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 EB8BE39A65; Fri, 19 Mar 2021 13:41:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161315; 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=PiT1u4jCRWI88OCOdbv+bRZeeqCIB4w2xlxwBpcJhns=; b=fzGSc4rpBP9FyBHS/yXaOYxrWK0hB5DDYyvzAh1jDAgWYzPCrW96yGWyLJ0II4+z1VP1pR 8AYpeVHhrEAOtDJf4rNyyCYvAqPMypJAbZDKiAgLQkyGAHn7oyhKCg9+7cGPX8FtLiCojB JZ9hBNz2mkJV/Yh3qeQitb5j1VrA97s= X-MC-Unique: ATeeDjI3OPiGji48QxXOcw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 14/51] conf: Use virTristateXXX in virPCIDeviceAddress Date: Fri, 19 Mar 2021 14:40:28 +0100 Message-Id: <20210319134105.442774-15-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/util/virpci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Tue Apr 30 19:40:33 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=1616161322; cv=none; d=zohomail.com; s=zohoarc; b=TFQSayj8JbjXxGsFUapnurk1f42CauedhbaIND8ADZh/KyEe6YIZnOsJknH6BaJANnew4jbCl2CWs6fS58PSlVjmSpZUQA+OINTpwHfPZ2PnsoambEWAiCdUZoLK5Hp39xBA3Qf9HlOLYEgZScIE1hGj9fBZbVlx9SYyK4Cmdv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161322; 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=fNo9xpWEuVmaBIfGDG3Xv3v7OI+GF9aZlehDuX4kSwPYOUA0Q25U8KV21PhQbJc1GXLdj/SdiEm9g7hAujirmD0aR44LtezEGd7NvbGOHYo2Roi/MbBJBkoeiR9QDCHt5BFJ4GdxnO843gbJzkPZuSXfDkFcY3GZnQYzJ2u0sIk= 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 1616161322864640.1002956808074; Fri, 19 Mar 2021 06:42:02 -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-428-yVc6jXn-M0-N7iJY6ehDhA-1; Fri, 19 Mar 2021 09:41:58 -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 E687B81623; Fri, 19 Mar 2021 13:41:52 +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 AFACC1000358; Fri, 19 Mar 2021 13:41:52 +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 6871A4A71C; Fri, 19 Mar 2021 13:41:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfYjp019298 for ; Fri, 19 Mar 2021 09:41:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id B2FE12BFEE; Fri, 19 Mar 2021 13:41: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 0617A4F3C6; Fri, 19 Mar 2021 13:41:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161321; 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=Zx/v1qB5jgTIStDg9h034DssH1tBfhZ3+g8y8xw/P8dK9RqwV5jsrF9yc90PCi+ANLsCnq BxqJtNPUHrq7tbtyZyY72h/TYhs1J6lO8BmEykmaSRyaYhTPkHIvYTWpKmvTOio7AHQfwx mGNhQtoU20l1AjeiPl/2eZRxekWVRYk= X-MC-Unique: yVc6jXn-M0-N7iJY6ehDhA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 15/51] virxml: Add virXMLPropTristateBool Date: Fri, 19 Mar 2021 14:40:29 +0100 Message-Id: <20210319134105.442774-16-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.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" Convenience function to return value of a yes / no attribute. Signed-off-by: Tim Wiederhake --- 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 Tue Apr 30 19:40:33 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=1616161327; cv=none; d=zohomail.com; s=zohoarc; b=l2fBtWOALOHL7QrXdYa5ktWztD7wYudvXxgDTwCrx8RlxcJwEuW4gsazajBTVT4FaZEqN9SIQ1n3r8gWZ7STC58ff+z2geLK/npiKL3CF+0XAw46pu1ZNzcyFm1tSUP6FzsqiNBIm/LQ4jkC73GCPuITchX7pYY6E7hHPv1uwAc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161327; 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=nP51zM5jiYAN4ujA/xDrHB5z2jb2VmbaImey5xUW6zVTCqYqvD3DfiT8xAX7FC3PBxReaKZA+d8JQ7RI4q94jIKjT/0k11QpjP/M3kX6tW6EstrRf8FuI3XAs0oX0zTyphzqT2RzUOcX58Q6oBSHFn589BfHoxUTFBJXRDqs4po= 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 1616161327226865.8060509377166; Fri, 19 Mar 2021 06:42: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-263-mgiFXHzvOCeKoPLsuYmMYA-1; Fri, 19 Mar 2021 09:42:03 -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 9E23A81622; Fri, 19 Mar 2021 13:41:56 +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 79B6760BF1; Fri, 19 Mar 2021 13:41: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 086D250039; Fri, 19 Mar 2021 13:41:56 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfZBp019312 for ; Fri, 19 Mar 2021 09:41:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id C115E2BFE2; Fri, 19 Mar 2021 13:41:35 +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 1476863B8C; Fri, 19 Mar 2021 13:41:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161326; 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=f3bAu3/Vdtdk4Q1uECpDoJQS9qlImzwyqrPL9tQJhTTR7tn0Tvd7TeSKdGFtvE58CTEaAs a1vJq2HZjyRgckyzovg2FKW+E9glOB3S6TwrAoI/ytsK7rX1+52GpwKCBKifw31OKB/TDh PZpE5zMX4FgRdHdZB55j9EQ2VGBU3fE= X-MC-Unique: mgiFXHzvOCeKoPLsuYmMYA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 16/51] virxml: Add virXMLPropTristateSwitch Date: Fri, 19 Mar 2021 14:40:30 +0100 Message-Id: <20210319134105.442774-17-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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" Convenience function to return value of an on / off attribute. Signed-off-by: Tim Wiederhake --- 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 Tue Apr 30 19:40:33 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=1616161311; cv=none; d=zohomail.com; s=zohoarc; b=TB43adZ6BXRKgnkxSs6NxI+Hvh1VUUcAW8vmaeh75ncMn9am+Xh9MTEoUorbRQPAQ3ztZWijL+ScqBY4f/5Xg0mtONKHJtRpyENR2egPR8XnG4x42PtwaN+NF4ZOawcTRwgRxaAQPmyj9MGlouOzdJVYzPuRto3Fsb3Dl5A4PmM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161311; 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=GmiRXNgtTOzsQB4aCZpCXTKjpxud1HqJ3wWILWdNtak=; b=bipaSmycVfQj/SKU8nmKl5GJqNh2HSZqJili7c2oYh6XLy0nMmOfntrN3pR+mLDt4plCjTxC/FEchJ1yC3j85D/7JeAcWcHAqwXvJkUXqZfLexOQZXlEMtZ2BobWqGR9ayKzMETD3Xg+BfL5xbOWzRpTJfyArUb5hvjB84N+jI0= 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 1616161311060774.334847921661; Fri, 19 Mar 2021 06:41:51 -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-349-GiZuTQj3PPe3ADZCKQ6X0A-1; Fri, 19 Mar 2021 09:41:47 -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 0143E101372A; Fri, 19 Mar 2021 13:41:41 +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 D06FA6090F; Fri, 19 Mar 2021 13:41: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 94192180C5A5; Fri, 19 Mar 2021 13:41:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfa5I019333 for ; Fri, 19 Mar 2021 09:41:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id C87312BFE2; Fri, 19 Mar 2021 13:41: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 1F18850C0A; Fri, 19 Mar 2021 13:41:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161310; 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=GmiRXNgtTOzsQB4aCZpCXTKjpxud1HqJ3wWILWdNtak=; b=XzNmzAo9FBQH/gNYY9+KCUHxoD/kOJV4C5hkn1hxgwo8BLZT7GwxlTuGVNil49F3cIpbr5 1vWtJDmOEi947mWLtNaDkdeJmMfEmNC5ozzHudfwVMTTdPgyQYIMTk3cKx+FEdf77UH+bz 8EoJBbEAHziHGXfVuWlKtnWI/pgXk8o= X-MC-Unique: GiZuTQj3PPe3ADZCKQ6X0A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 17/51] domain_conf: Use virXMLPropTristateXXX in virDomainKeyWrapCipherDefParseXML Date: Fri, 19 Mar 2021 14:40:31 +0100 Message-Id: <20210319134105.442774-18-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7671050134..3ac041e3d2 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 Tue Apr 30 19:40:33 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=1616161308; cv=none; d=zohomail.com; s=zohoarc; b=gvsehvZUBny1nY6T+nnmMTDqQCBiOVr9zhvqqzRJrsSm3ehe2cu/pNciHk5oNWvN8mS0ueZROJJd0qnc9NUIeUpqC1aBIoAmWdqeZo3MJx/EvxaqGa0DdilpoWxo1NAIQiIxHpR/PRjsqgaqOKwSqsptJUydmCfiOASNBqeShuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161308; 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=YtRUpRv1SzDwzlm+kF39oJKnjwkJFcgSIuG7GpzmHjM=; b=amx2oKzR2H3GbuA2tT0DbNVJhtHnRwXaCTgxfGU0jYzCV0wQmHaOSi9Y8gc4Ic1nTeKz++dBji2X6n2GaNndojoVuf52pb0ZaGMcZWDAiGNyYc+XQ1kVkb1IOQt4YkYRAqIc6zm5AodbN2lzw7k9hOSSQHquFH9prx2knRvUbgQ= 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 1616161308539925.538521757967; Fri, 19 Mar 2021 06:41:48 -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-224-luwcRLVdOAayHSO2ci6D3A-1; Fri, 19 Mar 2021 09:41:45 -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 B8EF7190A7AF; Fri, 19 Mar 2021 13:41: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 9138C2BFE2; Fri, 19 Mar 2021 13:41: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 2A051180213A; Fri, 19 Mar 2021 13:41:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfbSH019371 for ; Fri, 19 Mar 2021 09:41:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id D320C2BFE2; Fri, 19 Mar 2021 13:41: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 26C944F3C6; Fri, 19 Mar 2021 13:41:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161307; 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=YtRUpRv1SzDwzlm+kF39oJKnjwkJFcgSIuG7GpzmHjM=; b=CkRNpu2knBWN0Uq1ZO6xAHS+qFS3vSvUnOp8A4fVIdk/mQpYvHJHkR3Qe+mXgiBGdfBRFN luHDjJq5wfrdV6jpAiO5V2yEKK9wnBRAoE7IAZhdbm/5mlII2YJtizECSHjhiXLV6AspZT j9ZqUynff+rcEfE+gxfwpYDwkFbKZuo= X-MC-Unique: luwcRLVdOAayHSO2ci6D3A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 18/51] domain_conf: Use virXMLPropTristateXXX in virDomainVirtioOptionsParseXML Date: Fri, 19 Mar 2021 14:40:32 +0100 Message-Id: <20210319134105.442774-19-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 3ac041e3d2..c8411bdf40 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 Tue Apr 30 19:40:33 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=1616161446; cv=none; d=zohomail.com; s=zohoarc; b=Rz9xxx7VTWdQo8wGqprKElMiiaqTLsM7tSGDDjRpj6v8kS1qkJ4TrWm0DTLyQOCDwShug8kcFA/NHGkFt428oIylUuzK83Vwg109KKnOnYlI6CSjhjQ2EeOR+5zDKsms7O3eEW/Tj8FlsnHvcdW9MZNylN3Jk4zR5y+YRK2H4d8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161446; 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=HXWKW9fc/u25IZ3sYjjld2IcyFnJpwL8qN5+9v7lkY8=; b=irj5k56JOHII2yOS0UJB4PyRt4329fimPjbvnDLAy68Xhu/u/5MnKm+oTlBZ//Se0IYWtXeaJMGJxBJnY6UXZGUz1g88NT0KMxyhpta1jINEdzoGlPCgM2FGSgsmgCX95Y/Z2jOTCF73Bw/nCa6EsdVYP8ggb/pi1m1q7oMAbYk= 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 1616161446741733.6542268502442; Fri, 19 Mar 2021 06:44: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-484-8FBZWB7sMziD2emNxK6AMw-1; Fri, 19 Mar 2021 09:41:50 -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 AEBF810866A7; Fri, 19 Mar 2021 13:41:44 +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 710DE60BF1; Fri, 19 Mar 2021 13:41: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 085A94A705; Fri, 19 Mar 2021 13:41:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfc8X019401 for ; Fri, 19 Mar 2021 09:41:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id DD2632BFEE; Fri, 19 Mar 2021 13:41: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 30C2863B8C; Fri, 19 Mar 2021 13:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161445; 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=HXWKW9fc/u25IZ3sYjjld2IcyFnJpwL8qN5+9v7lkY8=; b=ClxKqd5JSKU50orttkybrzNn/itjgWsxGLMLOFrb7ysX0mbTD8wYHEIy9Y58G9sNZDqjPn 8p3aMmRdht8cj6U1n8lBPYKfTskiVj6w/jqI+Q7/9aQ54OmfLoUkIJxBQvLqT/k+8dr7Mc 9DfXXunCDPhArW8OqcNxrXLTBCe+EqM= X-MC-Unique: 8FBZWB7sMziD2emNxK6AMw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 19/51] domain_conf: Use virXMLPropTristateXXX in virDomainDeviceInfoParseXML Date: Fri, 19 Mar 2021 14:40:33 +0100 Message-Id: <20210319134105.442774-20-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/domain_conf.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c8411bdf40..91dc00edad 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,18 +6647,13 @@ 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= ); + + if (virXMLPropTristateBool(rom, "enabled", false, &info->romenable= d) < 0) goto cleanup; - } - 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); + + 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 Tue Apr 30 19:40:33 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=1616161326; cv=none; d=zohomail.com; s=zohoarc; b=Xp8NpQhqfMsJekwfbvWT4Yf1332zSlxeM8gJLFs4dBNqD6blFvg6xgDmgd/ElNP6TdTQgx9909rouXWd8DSfI+3GvTkG77Z0mqyfFFGpRM9FI6YdSLRBBBi2H6Cpy563/BeBEYUCNiqv2bJQBw8orR/vy6nz4advMmO9HmXyw4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161326; 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=ERDXL/a6JsVgO9XFIv9wtBdTt1WnuqdMDYhNdMH5EwM=; b=Qwpso4Mw+HiLpiGOMMmn8XsoVcmzJrvuA2huopBTYoY4sjVcNm8H0jlPQZvuAl6Bt48rNbWm80r90MhTVyXoi+H0mxRdsm0UM9d9VJ60lFCFnRfrSJCP/wUQxPIlLSf6Fcp4k2a47f08RojOWQUW8XkpIIq16Az3giu3m7/KxME= 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 1616161326866466.5056200341745; Fri, 19 Mar 2021 06:42: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-467-vfOxq6soPi6QZvepxEusCA-1; Fri, 19 Mar 2021 09:41:49 -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 D0E9081620; Fri, 19 Mar 2021 13:41:42 +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 AC1A36085A; Fri, 19 Mar 2021 13:41:42 +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 5CE63180213D; Fri, 19 Mar 2021 13:41:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfdvd019442 for ; Fri, 19 Mar 2021 09:41:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id ECE0A39A65; Fri, 19 Mar 2021 13:41:39 +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 3A6E763B8C; Fri, 19 Mar 2021 13:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161325; 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=ERDXL/a6JsVgO9XFIv9wtBdTt1WnuqdMDYhNdMH5EwM=; b=G9sdcuZr5abac71CmPPpzlhZfqPu4aOm0nlIJHH/GzbBRvPGgurLWrWqg/aRnNc89kJsAT bqVV6u8ofRpLyQVsFFDSdDD85mwDWEHQVR6SmB9Ptu4qlTAtxfIUptuhzWrzL7knSk8IBj 0P98OWpBEEuzmfzvqlodwwgy/fpalQM= X-MC-Unique: vfOxq6soPi6QZvepxEusCA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 20/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNetworkParse Date: Fri, 19 Mar 2021 14:40:34 +0100 Message-Id: <20210319134105.442774-21-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 91dc00edad..0e9106b061 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8275,7 +8275,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; @@ -8299,12 +8298,8 @@ 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); - return -1; - } + 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 Tue Apr 30 19:40:33 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=1616161516; cv=none; d=zohomail.com; s=zohoarc; b=TEO1/BbrBbgceH0zl9zODSL8p6pSsrz0qsZjMMLzqhHrIcQ6IRxORrEEG7zQRxrdF4QCCEYvhX8R1acRpxH24hZFMdTbpi3ST+UHqbdvICCteK255YTZ7psEsrygRQS6oIlWI7zwwdfJmbU4aat1Ir4m7SRxGE+BLM61UZFDVMg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161516; 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=CRH/7QkNAjIoCVPcdimpfq0sQXUu2+r/M/TWEPPfWJg=; b=bMUWNmz3KNCN5hA85CJBy/08s/r4dN4fSLeeh7TnXvl+cLxMLy4L07dreYCcioV9E1L7ahibGoS0uKEP79T4kI7aai0T5vJkb0hoPa2YAr/Ucg2l8LX6IeIyV5mdJ/yvAtLeAYBSPmOUUV3js9rZbKUU92af6KKW42Ih94+rR0E= 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 1616161516499105.45068578413589; Fri, 19 Mar 2021 06:45: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-344-oEaickbBP4ShtV_bsQIJrw-1; Fri, 19 Mar 2021 09:41:55 -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 1323E8163A; Fri, 19 Mar 2021 13:41: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 BDB465C27C; Fri, 19 Mar 2021 13:41: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 2A44C1802144; Fri, 19 Mar 2021 13:41:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDffiT019492 for ; Fri, 19 Mar 2021 09:41:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 064B42BFEE; Fri, 19 Mar 2021 13:41:41 +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 4C7BA4F3C6; Fri, 19 Mar 2021 13:41:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161515; 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=CRH/7QkNAjIoCVPcdimpfq0sQXUu2+r/M/TWEPPfWJg=; b=FYNspxLa8QKk//EQ6qxtUew7DQ59KtcfKtFKNzJ8SzTRJNx+4FshEiWoxiaCL25hAEgyLb AydiOTVrIm+9EfNC8rjQmEaKmYp/4waLlqo95UWhJ+d/2ttf7H7WE+fmSv7zQyoMWNhuq7 fQ8WiLJs1AciCmP1TZjp36E+Fta/S80= X-MC-Unique: oEaickbBP4ShtV_bsQIJrw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 21/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskSourceNVMeParse Date: Fri, 19 Mar 2021 14:40:35 +0100 Message-Id: <20210319134105.442774-22-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/domain_conf.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0e9106b061..39b1e237f5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8398,7 +8398,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); @@ -8429,14 +8428,8 @@ virDomainDiskSourceNVMeParse(xmlNodePtr node, return -1; } =20 - if ((managed =3D virXMLPropString(node, "managed"))) { - if ((nvme->managed =3D virTristateBoolTypeFromString(managed)) <= =3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("malformed managed value '%s'"), - managed); - return -1; - } - } + 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 Tue Apr 30 19:40:33 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=1616161519; cv=none; d=zohomail.com; s=zohoarc; b=KglHU6IyEvBV84YgEOjtkdD63TfInValzbv2jY3hXtDBGyRpe2SFf2K+4KHs3XfQeSV+Y4W+46ZS8aVsyU6Xu7i5mFKU8w9kBO0BcX+57WeQr7tse91Dl7UkZPZbnNhyuWbb22IBC4qvsKs8m2xrVCtjo5i6fyCkv8KilOXO6aU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161519; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7F29VkqrhsinZ3B5pNFsC3rBYij/tSabhN8RjpjdOuU=; b=J6/U5ketxINOF8I/uGIJGIet9tIuiATl1iRbbxEfOBj+ESXf1yVtclVbl/Z+twetsY68FPiuiVpbI2RninSQoBb3Ci1gdak6U2hYWD4UhB8rgIhBkKihIZFtHVu0lJzIUW7EptNGo/3XcqhWqfxlf5KLKQtmW7r9dM/VEriQO6M= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1616161519979267.0655907188442; Fri, 19 Mar 2021 06:45:19 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-50-Fh777CXcNGm_GZ6HT-GhsA-1; Fri, 19 Mar 2021 09:41:53 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 98BD781630; Fri, 19 Mar 2021 13:41:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 67BCE60CD7; Fri, 19 Mar 2021 13:41:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0F79E4A71B; Fri, 19 Mar 2021 13:41:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfgfM019509 for ; Fri, 19 Mar 2021 09:41:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1AC6239A65; Fri, 19 Mar 2021 13:41:42 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 59C8063B8C; Fri, 19 Mar 2021 13:41:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161518; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=7F29VkqrhsinZ3B5pNFsC3rBYij/tSabhN8RjpjdOuU=; b=JMxoFapglAJ+NMQb7kodAk7wJ+YqejwQMEd7QFHaWLuj0ki3mEwVMQYEW4B3bKxcAxfjQr eMihOv8pJUizFub9fcQItmh+nrr1PFIC2gD3APfRqqEn9ecFxUxzFNWrZ+c98Vz9wQh0EL rHyI3TzOkpjFYECRk4w3epHYFPLPScM= X-MC-Unique: Fh777CXcNGm_GZ6HT-GhsA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 22/51] domain_conf: Use virXMLPropTristateXXX in virDomainDiskDefDriverParseXML Date: Fri, 19 Mar 2021 14:40:36 +0100 Message-Id: <20210319134105.442774-23-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 39b1e237f5..ef7eed5682 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9133,29 +9133,14 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr = def, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "ioeventfd")) && - (def->ioeventfd =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk ioeventfd mode '%s'"), tmp); + if (virXMLPropTristateSwitch(cur, "ioeventfd", false, &def->ioeventfd)= < 0) return -1; - } - VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "event_idx")) && - (def->event_idx =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk event_idx mode '%s'"), tmp); + if (virXMLPropTristateSwitch(cur, "event_idx", false, &def->event_idx)= < 0) return -1; - } - VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "copy_on_read")) && - (def->copy_on_read =3D virTristateSwitchTypeFromString(tmp)) <=3D = 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk copy_on_read mode '%s'"), tmp); + if (virXMLPropTristateSwitch(cur, "copy_on_read", false, &def->copy_on= _read) < 0) return -1; - } - VIR_FREE(tmp); =20 if ((tmp =3D virXMLPropString(cur, "discard")) && (def->discard =3D virDomainDiskDiscardTypeFromString(tmp)) <=3D 0)= { --=20 2.26.2 From nobody Tue Apr 30 19:40:33 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=1616161513; cv=none; d=zohomail.com; s=zohoarc; b=dQuuwAmX9+oinOUBXWSE5Y3voMRa8/B//73m6Uvn4ikgQxBOAGVkD+9d9hGGspPU+Lu2Waap9IIRdZdYgbHx5fGKNsKtykOHnDtzX/4CaVsceBkKlnzaK04DRz08U0pgickepj9Oxqi8IZSHBvB+/ZZg39FF/iFW5f8IrtYyQF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161513; 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=m5m47gEy4Afy6KMyGllHbfDCvtAS+G6wvuADe7PYsT4=; b=bkVRPSfvS1P05RNWtaKPptYfUbbhO3saDFXcs6fRsxg8N6NyFaxxK2Hs7qKrq3EiWp3gIoSd5C+qP4eBToGJwNHsSZdyO+EWHyJ3hZYUKe8L56YZ9m6i5sf8HdwqdhCAnDB33JejnInk1hinfsVHbxPqVrC1oNx089mNa7Gs82w= 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 1616161513704554.4679437502687; Fri, 19 Mar 2021 06:45: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-358-fmUrso0qPBmjAs5An6x4Eg-1; Fri, 19 Mar 2021 09:42:06 -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 EB48D1013723; Fri, 19 Mar 2021 13:41:59 +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 C9A8A60BF1; Fri, 19 Mar 2021 13:41:59 +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 9235550041; Fri, 19 Mar 2021 13:41:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfhpH019530 for ; Fri, 19 Mar 2021 09:41:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2198D39A65; Fri, 19 Mar 2021 13:41:43 +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 6AD592BFEE; Fri, 19 Mar 2021 13:41:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161511; 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=m5m47gEy4Afy6KMyGllHbfDCvtAS+G6wvuADe7PYsT4=; b=fXv35P2YAEwFlX4UD1JDVvvhuWOG3vZhGt1QNzVMm6hRw+PSuteBRbfqzDl4/9+7++9X37 sikN6XX0mVNoN8PRls4/BQvqagyi3D4c2kMEs/nveAL2O4PXZsNTw4Vkh4aeL7INrbgvsE 89yoMCtsqRFy+OL1KYbRAX8b98FJq50= X-MC-Unique: fmUrso0qPBmjAs5An6x4Eg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 23/51] domain_conf: Use virXMLPropTristateXXX in virDomainActualNetDefParseXML Date: Fri, 19 Mar 2021 14:40:37 +0100 Message-Id: <20210319134105.442774-24-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/domain_conf.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index ef7eed5682..bcc89c0afc 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10436,7 +10436,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); @@ -10464,15 +10463,9 @@ 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); + if (virXMLPropTristateBool(node, "trustGuestRxFilters", false, + &actual->trustGuestRxFilters) < 0) goto error; - } =20 virtPortNode =3D virXPathNode("./virtualport", ctxt); if (virtPortNode) { --=20 2.26.2 From nobody Tue Apr 30 19:40:33 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=1616161323; cv=none; d=zohomail.com; s=zohoarc; b=CxZsDWAyLzdQX+X8KAUHKyMDHntwX7lbwODuwhAnWdKgxH7XcFqMRWlLhvexfzQvLn7b62eiOoQEQGwNeGRV7Ark++lBiE9jvo494FUzi6lHrVd+8bpUz94oeIg/sHzwWd5fOIDn/0vM8N5pxWB0edBJOAYH/VeXcGxKtMTz7EI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161323; 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=pKNv7h7cACLhwVdV6OZLq0TKdRIqIqtXfnepfEvmD5Q=; b=LJUFV7miAiNdymBdg9QKdROsng1ObBR+fLkeeK7vmd0EdyvjrYDBMmk7mnCYRPiQLp+1TjFiywPo/6aB1v89YWvUAnvXUIHF92YCtY9ky08fS1MYTa06y9PhqWUfQECkJMtHe2dL9UjIBIDa06oS0X0MbbLS6V/txkWTPkzNIrM= 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 1616161323512645.9848409620604; Fri, 19 Mar 2021 06:42:03 -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-2-BFh1E2xyOKaHUtw3-JZwow-1; Fri, 19 Mar 2021 09:42: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 72D1310866A8; Fri, 19 Mar 2021 13:41:54 +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 43B3B1F048; Fri, 19 Mar 2021 13:41: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 F0EBA1802147; Fri, 19 Mar 2021 13:41:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfiPk019588 for ; Fri, 19 Mar 2021 09:41:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 2A0234F3C6; Fri, 19 Mar 2021 13:41:44 +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 73A392BFEE; Fri, 19 Mar 2021 13:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161322; 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=pKNv7h7cACLhwVdV6OZLq0TKdRIqIqtXfnepfEvmD5Q=; b=hR0AIvqyyZsgE36XJafBcAVmfyjXzbj7yqKNQSmd/28qbPGtjcos4L7PTnGekEsjHNsMJ8 tSGJ55lFKKHcgBIVraY6CeWjGckM2dOZ6iii7/eV8TNMTBGRvyB5SXDzjgtLVN1LpYjl5Q PVMrDZ/30qpWRgPHd2SwUKkkJ9Je3uo= X-MC-Unique: BFh1E2xyOKaHUtw3-JZwow-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 24/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceReconnectDefParseXML Date: Fri, 19 Mar 2021 14:40:38 +0100 Message-Id: <20210319134105.442774-25-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index bcc89c0afc..fef0b7235a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10619,7 +10619,6 @@ virDomainChrSourceReconnectDefParseXML(virDomainChr= SourceReconnectDefPtr def, xmlNodePtr node, xmlXPathContextPtr ctxt) { - int tmpVal; VIR_XPATH_NODE_AUTORESTORE(ctxt) xmlNodePtr cur; g_autofree char *tmp =3D NULL; @@ -10627,16 +10626,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 Tue Apr 30 19:40:33 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=1616161327; cv=none; d=zohomail.com; s=zohoarc; b=FYvTWKUBWJoqO8VhexYhx2DY6XrWZHS3G9iYt99/1bWuM0YmHmw5ZeYlNJruPKCXjZIDvFYZKNR/hWOTfYIxVvfHkUL0eYHCsNxp1KB8rU5QDLca+rdKR9xyGr1RIYYpWPrNCFBZcRR3G6k5G5Pci8gM0H5xXS2zeSTUKhk9JSU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161327; 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=ps5d20mn9kVbhKoUe/IbroR3ta9/DErX1zlMSeTmtmQ=; b=c/fzLk0lv0Y6v3h2ooWmhvzf175oylSS4A6aQQI9x9nOOvqcDWncLHkSju+TqWa18qdhR3YIMRTZlHe/cjJUSCcLF9HpJjuBo9+6tB5oYWNf5W1X1qp7mCwb8/89GSvPJzIOjrwjAIUPgwN2Soe76UZK538sr2g85QYNPe0qcg4= 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 1616161327242677.2202562292036; Fri, 19 Mar 2021 06:42: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-44-oMcPArxjMIS1LOcIXldMMg-1; Fri, 19 Mar 2021 09:42:03 -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 F224481627; Fri, 19 Mar 2021 13:41:57 +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 C54AC19715; Fri, 19 Mar 2021 13:41:57 +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 7C2105003C; Fri, 19 Mar 2021 13:41:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfjeQ019632 for ; Fri, 19 Mar 2021 09:41:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 38B9E39A65; Fri, 19 Mar 2021 13:41:45 +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 7CAD763B8C; Fri, 19 Mar 2021 13:41:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161326; 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=ps5d20mn9kVbhKoUe/IbroR3ta9/DErX1zlMSeTmtmQ=; b=bqtnMVWxYgz48SUSEIoq1OIU+Q8/G84wBYrGrxSPrtpUppulR25lhjar+N+dcysEGeOmyY xKhVHIX22Z7adxGcRbQLQ7vrKeE+hSfMndf+3sKb26208U8S8V57S8vXSB5a6sskMjBdR0 wKqvBsdTFP9d2/6PU+Sec5WAiECiLmA= X-MC-Unique: oMcPArxjMIS1LOcIXldMMg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 25/51] domain_conf: Use virXMLPropTristateXXX in virDomainNetDefParseXML Date: Fri, 19 Mar 2021 14:40:39 +0100 Message-Id: <20210319134105.442774-26-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 177 +++++++++++------------------------------ 1 file changed, 48 insertions(+), 129 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fef0b7235a..329f42d6dd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10720,7 +10720,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; @@ -10730,7 +10729,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 @@ -10750,15 +10748,9 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlo= pt, 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); + if (virXMLPropTristateBool(node, "trustGuestRxFilters", false, + &def->trustGuestRxFilters) < 0) goto error; - } =20 cur =3D node->children; while (cur !=3D NULL) { @@ -11328,128 +11320,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 Tue Apr 30 19:40:33 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=1616161453; cv=none; d=zohomail.com; s=zohoarc; b=AA+wD2zr1SgS8JxTiY4NS+ScIWTxCq/h2xYZEdATc9uMLf6xqndPxLyO35TJkeZ4IRIgD7oeD+jNrmEUZtDTmcuH5UdZs10clfxlSS+5rLaEGYeZRcq/2VNEnqkCEveaU1NzPC1/F8Z26loRpa7HHAmWFdTY7+v/B9AaprWRUaA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161453; 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=a9GvnTJeTAygE5v3gsZ+5cDHM/V+Z8vmzDI9USjwceo=; b=Ax+8SSsY0pn6YZQTtIxu5WA75kaKNRpciPjB5Ngx7HiaQvb0yyIA9YJZnQVrcDF+VAmfDMwmcnAidFQYoGVo6U3EBId5CRh41cMJFd5RtjIvx5+XlV2M7FWMl3HZe5FgNwuu8AcRZnYA0QAZJuTUvJMns1E1rRwrN5vMhWEisa0= 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 1616161453196327.64512812129556; Fri, 19 Mar 2021 06:44: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-208-R21cBwShPEKiyzvjyoWdwA-1; Fri, 19 Mar 2021 09:42:10 -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 39B1B83DD23; Fri, 19 Mar 2021 13:42: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 116B650454; Fri, 19 Mar 2021 13:42: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 B5EC850043; Fri, 19 Mar 2021 13:42:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfk3R019666 for ; Fri, 19 Mar 2021 09:41:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4554239A65; Fri, 19 Mar 2021 13:41:46 +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 87DD863B8C; Fri, 19 Mar 2021 13:41:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161446; 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=a9GvnTJeTAygE5v3gsZ+5cDHM/V+Z8vmzDI9USjwceo=; b=LYAtGD5r+b2mi0XbGaG/47cxhKUT5WuGtOLLik3iLxo0kAvNAnTBNLpf/w8D7qpH4n3/ha jK/kNIYtfoaa1zJ2UnzGgOu71GfTpuXmNP4huSukKJHASJGplaLH665fqb1DikOHjq+epp Q2Y9/TKXnU7Yl5tmeJcIFUVMLtQWnM4= X-MC-Unique: R21cBwShPEKiyzvjyoWdwA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 26/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseTCP Date: Fri, 19 Mar 2021 14:40:40 +0100 Message-Id: <20210319134105.442774-27-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/domain_conf.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 329f42d6dd..9822f4f451 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11704,15 +11704,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"))) { - if ((def->data.tcp.haveTLS =3D virTristateBoolTypeFromString(tmp))= <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown chardev 'tls' setting '%s'"), - tmp); - return -1; - } - 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 Tue Apr 30 19:40:33 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=1616161332; cv=none; d=zohomail.com; s=zohoarc; b=IyR08BILzTqZTC7rgAl4Wb7/PhP1kcIcUhJwJtntkhUadYN0/KGSLkEZu5ZUaC9gkIBFXFRMoDwiCR9JXIXkrSnEo4QpAXecl4J09HLm3m3mxw3XCFuA3wtsWL53yJLdHBnTRLD2FZc88i+Iuc5Rx8XHKF+hKGxYjKx6rhwSIxQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161332; 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=FJKt6nqGvDmyTB/7u9gkPb/QLkuvaJUx4n2I1FeUN/s=; b=NVwKgFNOzy5RaJ+HkZn8AodSJcNZgI6/1GhOY8avQzfMJHGDUgTuBDiHL3PhpChWQ8l/1CQq1euqEOdvlG+MBX/ap7KMtRpmBpX+Vc5/fPVSIBHZYmUf0qmoM4cXPAyKViOGtEiE0yZbOe51spczGyJX/ofIupkhqQJBeGfiM/c= 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 1616161332907633.5267317474835; Fri, 19 Mar 2021 06:42: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-153-KrupsWmWO0eTBFNso0OhoA-1; Fri, 19 Mar 2021 09:42:09 -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 0E77F10866B2; Fri, 19 Mar 2021 13:42:01 +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 DAEA810013D7; Fri, 19 Mar 2021 13:42: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 9F3261802149; Fri, 19 Mar 2021 13:42:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfl6x019710 for ; Fri, 19 Mar 2021 09:41:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 51D9450C0D; Fri, 19 Mar 2021 13:41:47 +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 974CA63B8C; Fri, 19 Mar 2021 13:41:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161331; 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=FJKt6nqGvDmyTB/7u9gkPb/QLkuvaJUx4n2I1FeUN/s=; b=baVFW5CGg9hGGE7apV1mx53CtzkMHVL1xA36eIIQQhC+wOewV446VJrulM9udsLnplejUv E+cnol8QfGuRW3uTWM6JH9P7UHB60tlNbK2kfiMdymNkv/OCHZ8s8R5u1hxm4/xEoTJJqg WJzQIHt1mcuvW77bw3yiXzDOIWD2lsc= X-MC-Unique: KrupsWmWO0eTBFNso0OhoA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 27/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseFile Date: Fri, 19 Mar 2021 14:40:41 +0100 Message-Id: <20210319134105.442774-28-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.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 --- src/conf/domain_conf.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9822f4f451..fd7613a479 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11778,17 +11778,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")) && - (def->data.file.append =3D virTristateSwitchTypeFromString(append)= ) <=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), - append); + if (virXMLPropTristateSwitch(source, "append", false, + &def->data.file.append) < 0) return -1; - } =20 return 0; } --=20 2.26.2 From nobody Tue Apr 30 19:40:33 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=1616161393; cv=none; d=zohomail.com; s=zohoarc; b=OfQm9Vyfbm3cx6cIrIx4AgMOc3euifMlYG+CoTUXyM49uuXbeDKOkTQaIXjexpaucvvI5sVgoLIJZekDC0O+bhNwaXRY5Rr5PIoDHuitIJjzoAWx27h7iwyxF9rhmQSFYPKeIkZ5KKIeJeohbwT0hF50hyfzVV1DjJcewmP8hh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161393; 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=FWUyOS5L5m2U6oheMMHzivjViUgT9At+YbpKEGVXeHs=; b=PbSQ4qNj9mwxTTIlQYN4vjylBzZoQHkMSr7Xgtd1q+uJzOwAzDL9x2bZxxWXNbi4OrGZXGm/pX4CFOhARy5PQ0ZWgA+uWMA263arfwP8BTDL5DkIHUdCo+/CS6SGDQHpoQCHqb+Q964julkFkluYLAeHxhPIyZOTv+jGCbaTGSA= 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 1616161393293475.2073407711458; Fri, 19 Mar 2021 06:43: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-137-GWNyuajoOemTmYs6CsZaOg-1; Fri, 19 Mar 2021 09:42: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 ABAE481625; Fri, 19 Mar 2021 13:42:07 +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 810855D756; Fri, 19 Mar 2021 13:42: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 41F011800216; Fri, 19 Mar 2021 13:42:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDfsIX019892 for ; Fri, 19 Mar 2021 09:41:54 -0400 Received: by smtp.corp.redhat.com (Postfix) id D950150C0A; Fri, 19 Mar 2021 13:41: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 E7BCB39A65; Fri, 19 Mar 2021 13:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161392; 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=FWUyOS5L5m2U6oheMMHzivjViUgT9At+YbpKEGVXeHs=; b=K27Mfi7Jh9vABxfFr9owHsnKK481pzPKK5pCFJruSCjfP/5cGv/mrJdxvk1EIWRBnzhLrs DIsXrsFi7ghBtPyWM8X/HEzXqS7Mr+oaRdaqdSDP7gFlK/26s/fXx9Z8woZJ2osQHLfsm/ /4qBCv7I08qaL6M09gaiNU/Sbvvd2Qg= X-MC-Unique: GWNyuajoOemTmYs6CsZaOg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 28/51] domain_conf: Use virXMLPropTristateXXX in virDomainChrSourceDefParseLog Date: Fri, 19 Mar 2021 14:40:42 +0100 Message-Id: <20210319134105.442774-29-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fd7613a479..619a4306f6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11813,17 +11813,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")) && - (def->logappend =3D virTristateSwitchTypeFromString(append)) <=3D = 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Invalid append attribute value '%s'"), - append); + if (virXMLPropTristateSwitch(log, "append", false, &def->logappend) < = 0) return -1; - } =20 return 0; } --=20 2.26.2 From nobody Tue Apr 30 19:40:33 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=1616161387; cv=none; d=zohomail.com; s=zohoarc; b=D3c86PBQdq+Tis2KQmQk033vMwKy5iCFx/NSTH3zsuAHJn3/9pp3m3ho/VPrhHvCKFw2JgCn8DLNG5010UH7ftKNJFOGq/DC65sABlKI7DL9Csa6szy/TqApiI4UOkqaV6yPDVbEnyxGkEQ1xhj/RP79QaG6cw8zbTEcWZafvT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161387; 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=DJjLc/wUGdUD7abDPvdhZBNPtGF1+5wT6CLP0bH5OU4=; b=Cz95CHJ92/fLQAtxL9XHaXFTlfjjIbD2/1q3y12krMXtKbio2kWUocoznUbi7CwgJblnCn/YJYaPPQf9VSaeKeHWDXL3x2X92UvPdWTsjfuXnM7ghl3O+/KQrcoUQOmVb+DqMjQLsCYajUEnjJpyZ81xQHIzNjohFgNL6lohopw= 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 1616161387805789.1366012294936; Fri, 19 Mar 2021 06:43: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-333-sN-4KGZ7MnCWgyLjDsIVSw-1; Fri, 19 Mar 2021 09:42: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 A6A13190A7AA; Fri, 19 Mar 2021 13:42: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 80B4C60CD7; Fri, 19 Mar 2021 13:42: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 3C81B50045; Fri, 19 Mar 2021 13:42:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDg2iF020179 for ; Fri, 19 Mar 2021 09:42:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id AE99F59446; Fri, 19 Mar 2021 13:42: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 67ACD39A65; Fri, 19 Mar 2021 13:41:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161386; 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=DJjLc/wUGdUD7abDPvdhZBNPtGF1+5wT6CLP0bH5OU4=; b=CbwFuSYb9FgYYQwwk9uzlVAcmS/pwBBJWGxEW/xSU+L8V079inTxuZK0xZdXfxmAC9hvrq G1cFFrI+OWTygg3+f7zQzxARa1c2q1tSF0m0row1M6rDoxSe2AM91lnuOA1A7gy1x6h4Fi XNQ3jS0uqfMYDCA9c1RcBYSmoHt/LBY= X-MC-Unique: sN-4KGZ7MnCWgyLjDsIVSw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 29/51] domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLVNC Date: Fri, 19 Mar 2021 14:40:43 +0100 Message-Id: <20210319134105.442774-30-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 619a4306f6..3409355722 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13044,7 +13044,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 @@ -13103,15 +13102,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 Tue Apr 30 19:40:33 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=1616161350; cv=none; d=zohomail.com; s=zohoarc; b=XH0IXhN5+dbzZqb7a6YHjKx3LNtC1sYU75RqeXPZ6duqocPmG7vGTNrXO0ADJeSFwzi/KuGWb71o3yA1W21Wli5CJzsLgXyQccZAg0Hom7Tam+L6OwoTpfM4bep0WwSkH/swOfQUixQsPzvuDgN2kRtRGJAVlOFYs7oeuKKd6cI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161350; 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=bJAp6nrwZ9NK0sB/fusNkhitYOg/hQi5htrGA9G06hU=; b=JznMp0L2YpABFn/FB5Bgk5jRd7HIuKkVVENQQHN8iV7up2AzqnrEvvtoz6/UsIhdIdfh/W8gOUb+y96XSC4Whoc+og02p96CFNaZNkbItpkzn/+HI7nEdbm2E9TIdX8C7Lx5s6UpBrkDY8h+JPIb9bgpTmvPkGSrbAN4iOapFw8= 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 1616161350217154.85816704904062; Fri, 19 Mar 2021 06:42: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-593-2AU7hyE7Ok2ojweD5KIpYw-1; Fri, 19 Mar 2021 09:42:26 -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 DDC1E83DD21; Fri, 19 Mar 2021 13:42:19 +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 B82FF59442; Fri, 19 Mar 2021 13:42: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 7CA4B50049; Fri, 19 Mar 2021 13:42:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgIbK020461 for ; Fri, 19 Mar 2021 09:42:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id 00F0B4F3C6; Fri, 19 Mar 2021 13:42: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 1235A6E6F5; Fri, 19 Mar 2021 13:42:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161349; 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=bJAp6nrwZ9NK0sB/fusNkhitYOg/hQi5htrGA9G06hU=; b=ifsqnz+Pjt5ko0EBtSeWjmZT5rxPswh/YlwE8S6U8QcdLg/1oNEQZt6CpFd7K1BQFNR0wE Av26rFSw1RdAx53cM7AQpcjgbUwTuRSd0qSNG4cBZAVPPVzlAsU9okMP121bkgreI4l0sv kSXoV92WmfBL7AggWaimvd8FDo6kkhU= X-MC-Unique: 2AU7hyE7Ok2ojweD5KIpYw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 30/51] domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSDL Date: Fri, 19 Mar 2021 14:40:44 +0100 Message-Id: <20210319134105.442774-31-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 3409355722..c6c78abb84 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13140,10 +13140,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 @@ -13162,20 +13160,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 Tue Apr 30 19:40:33 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=1616161358; cv=none; d=zohomail.com; s=zohoarc; b=BxOE61JhUK6prMos3iNQhGuQWJdpxZKiSle+OXiVwad2dbm6q6Ir34/11GYeUoLe2BJCkTB9Qv/dWVYc1MYrDVkqf0I7yKZWiip8Y+ITSvChCog51o3m9zbt3fJ2x3NbNExPrSeR0L4fWl2PoEyrV2JMzq7E/6YmWOh74gaD5Rw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161358; 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=d3QOxJ3SXavmnCYBcspWFeAnkj+8ojcSwiNz+Cj6c8s=; b=jgJB/h2/BkjWLDri3fe6AZgatRTwV82FGnV1lLJIZx/cHmC7SA1xzFtIxOac1pD7uukMXCYO25HMLYLvfYaoos5JUJVRcXwN+swkxaeLp0nwgQpfVR8uT8gcrhoYrr/dSSaSHP5lfS+L479q0w3Sb8+qaMDKhO/hz4t+cCWCTZY= 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 1616161358257378.0455505353416; Fri, 19 Mar 2021 06:42:38 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-98-Gc0dyg1VO227yfFJZS_zdg-1; Fri, 19 Mar 2021 09:42:35 -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 28BBF8143FE; Fri, 19 Mar 2021 13:42:29 +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 F23585D743; Fri, 19 Mar 2021 13:42: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 AB7F1180B451; Fri, 19 Mar 2021 13:42:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgRrT020522 for ; Fri, 19 Mar 2021 09:42:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id D23AC2BFEE; Fri, 19 Mar 2021 13:42: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 C05B7369A; Fri, 19 Mar 2021 13:42:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161357; 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=d3QOxJ3SXavmnCYBcspWFeAnkj+8ojcSwiNz+Cj6c8s=; b=JxPhEzMOgUIWBKH83BpgM0R4Ke14fukoXaWRQbS1b5vboDKgBDowQJGqokj0TiXnVVC1oB fHvXu/aF9ksTko8Vlvy7Of03F7KAEMXBeFT/t0nvcgxLMRinrGBJRNmlLNIpdywi5ZjpG1 WNFuWT8cSo1hIOrv0aqRRJT1pzjBa8s= X-MC-Unique: Gc0dyg1VO227yfFJZS_zdg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 31/51] domain_conf: Use virXMLPropTristateXXX in virDomainGraphicsDefParseXMLSpice Date: Fri, 19 Mar 2021 14:40:45 +0100 Message-Id: <20210319134105.442774-32-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 75 ++++++------------------------------------ 1 file changed, 10 insertions(+), 65 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c6c78abb84..8f906e455d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13397,23 +13397,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"); @@ -13432,62 +13419,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 Tue Apr 30 19:40:33 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=1616161362; cv=none; d=zohomail.com; s=zohoarc; b=KxcktUofUv8JHH8mMt/LbdIRherg2+MCqEr/LqZZwPx/OREMEhhZ1NWKW7g1FFIZC7RgZfM4cZKGJ/Y+v8wS0WJUt5ZGi9r2DcUfBphvg0ANI8SjI3sGQrW0G63Nsj8dz1Wm3AjDiP+RMafwJwloQvw6APBJinmjOn9OsaVLzuI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161362; 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=cAjlSKKyNH0kCCa9/OLrMUPAMF2opoQDBwHmFtyOnSg=; b=cNLcqII92lNel2ZzUsjpIFZVCbbSWLcNu2M57dY5OagxDW/pIVrS45oCEY5yTDL4hGyaZKRoi6arWEXQfnxfreJSscf/RkX/3nM6S4SaU+poKl1uJl8bvniHh1wprpILxGcY06eDyFzR93GYmUGcQk1h58hhi5T670l5LfIq8OQ= 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 1616161362100860.2214415516243; Fri, 19 Mar 2021 06:42:42 -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-487-qutn9Vo1MTKwGac5ti7iBg-1; Fri, 19 Mar 2021 09:42:39 -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 D8DDA80D6AC; Fri, 19 Mar 2021 13:42:32 +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 8BDB05DAA5; Fri, 19 Mar 2021 13:42:32 +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 4A0A55004C; Fri, 19 Mar 2021 13:42:32 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgSx8020540 for ; Fri, 19 Mar 2021 09:42:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id E32BD179B3; Fri, 19 Mar 2021 13:42:28 +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 320F64F3C6; Fri, 19 Mar 2021 13:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161361; 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=cAjlSKKyNH0kCCa9/OLrMUPAMF2opoQDBwHmFtyOnSg=; b=VGqOSJyp3bfwaqdkWB21F5RRvSgm+nDKX5mWj4fg4j9IlNia8XvpwNskm3tZOLScwS8n3k XfIqI4qX7q0eLYdjtogxFsR6NfQ+FRm8WyV8mucXlX/iIG/gy6s3JDNNIzZi6zyFR5f0AU 5VsSt8cThXs+4W92fL4xRgTvv31iRVI= X-MC-Unique: qutn9Vo1MTKwGac5ti7iBg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 32/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioCommonParse Date: Fri, 19 Mar 2021 14:40:46 +0100 Message-Id: <20210319134105.442774-33-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 8f906e455d..f8793237d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13717,8 +13717,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; @@ -13727,21 +13725,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 Tue Apr 30 19:40:33 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=1616161366; cv=none; d=zohomail.com; s=zohoarc; b=TJKjycYZvl3pB+ju9HPfgFSAGZ5JkUTQ8xY59BusFrv2BuAnFGuD6KYmZhhzRi4z4hzVfDtm4HdkUiApElIevGs6oui0/8/sr0YRU3cKIHftru5KdbnjR80SShtCxbeVqTLjpu/yAD4zWuR1lwX+RINciWxXBJl32qT1G1upxr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161366; 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=sRcDeZkqMTR3H7E+B+eJYVWFmMCx1xHZx0Vy8DVcTZ0=; b=U2H8MUydwNZ9rbokBrt6vlU4YIHqv0q5nQ6EbhKLikKI+27XgB87fWDiEF+1Anxv7ndxiMs7xeDS9HbKzewEXHh3QPrynGAHwca+NXfb6oez9MONemyiWYArORexfzhmvfgy6+FyqUDtJnabdPzJL3QoxWeazm8PBWR1mhTNg7g= 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 161616136666853.69878868920705; Fri, 19 Mar 2021 06:42: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-563--OVe9PhkN9SKzfmdT51chg-1; Fri, 19 Mar 2021 09:42:43 -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 F164B190A7A3; Fri, 19 Mar 2021 13:42: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 CBD3F59442; Fri, 19 Mar 2021 13:42: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 8C44B180214E; Fri, 19 Mar 2021 13:42:36 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgZGM020576 for ; Fri, 19 Mar 2021 09:42:35 -0400 Received: by smtp.corp.redhat.com (Postfix) id C2CB459446; Fri, 19 Mar 2021 13:42:35 +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 2CA0763B8C; Fri, 19 Mar 2021 13:42:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161365; 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=sRcDeZkqMTR3H7E+B+eJYVWFmMCx1xHZx0Vy8DVcTZ0=; b=dkPqQpK9iqoY54L/0mnIBVdwUmszgtTU6XGtevsnDWpnCUhHRK0iI7/qHQ6RWyn76j9i3r qM5PYcoKeTOonvMXedfosegqbp97DRSLKFi4XDnxaDFqkA1hv4Lq3NDWv3Yk1XqBSOjK4Q 8OBVFOkh2EpxJgmELM9E5rvfnymP0Zo= X-MC-Unique: -OVe9PhkN9SKzfmdT51chg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 33/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioJackParse Date: Fri, 19 Mar 2021 14:40:47 +0100 Message-Id: <20210319134105.442774-34-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 f8793237d4..7714b58a6a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13823,19 +13823,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 Tue Apr 30 19:40:33 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=1616161370; cv=none; d=zohomail.com; s=zohoarc; b=OSAF+EODHtplSwBEVncMxU6SwaWPEtaNc/q2iRpVDdQWx7u2FCjpSzter+Z3L9Rat7W680BikPSefvTUbeMV+A59j+90q+OhU0nJJK7VlZ2wNqnWjt3muaRTDdeI2Kdc8xjnfIq4XZeLax8aS+25nTHm5GZyyPWvWxDO0WBI5Q8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161370; 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=eH09UpU5lJqbROd0x69NhwVwsk+pOPqtGUryjwQLrTk=; b=T1siEPbCwsz38GD2Pkig+KvR/XRTFZEG7TkEySeM42OOasa1OV0dbYqzI1U34TkhcyVGFcEN7iJsUIFpKpDLUziXwlHyo1JZLGxSrKIEZCI0FdQ+Es74bGMf6ZNsP0NwnlR5YZG74RsXPQ51MZwN8waXMQVSiTMQJWitj7X/q24= 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 161616137005954.43406627875322; Fri, 19 Mar 2021 06:42: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-299-RKkFOXC2P3ClSR1PnTb21w-1; Fri, 19 Mar 2021 09:42: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 6BF561084C9B; Fri, 19 Mar 2021 13:42:40 +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 46CC75D9F2; Fri, 19 Mar 2021 13:42: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 F3B36180C5A5; Fri, 19 Mar 2021 13:42:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgaK1020582 for ; Fri, 19 Mar 2021 09:42:36 -0400 Received: by smtp.corp.redhat.com (Postfix) id CBFB759446; Fri, 19 Mar 2021 13:42: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 1EEB563B8C; Fri, 19 Mar 2021 13:42:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161369; 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=eH09UpU5lJqbROd0x69NhwVwsk+pOPqtGUryjwQLrTk=; b=bDSoHYnuzh77Cv4PrbWbxyzlqJW7sFUPsBJVHEfFMpfldxEYGdCB0BSQTaKwyWF6k52ydV lCs2uyPu6pLiqU0QHkZ4Ltj1khlNC8YDIrWPqKC2yPZoaYBwF+hsZw9gYbJUppjltLbSHQ WcGExe76vIRWK56/Z//HBIAV0vGkElk= X-MC-Unique: RKkFOXC2P3ClSR1PnTb21w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 34/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioOSSParse Date: Fri, 19 Mar 2021 14:40:48 +0100 Message-Id: <20210319134105.442774-35-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 7714b58a6a..17b8cab707 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13838,18 +13838,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 Tue Apr 30 19:40:33 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=1616161377; cv=none; d=zohomail.com; s=zohoarc; b=mNXVy8AplLtU4MEALAHKSTabVZ4VLv5j2n7I3zZZA0mvKQrpGmG3MH7hsncVjnS8qphS00eCWcGif7ZlpYIdzJB3bdX79omN2ernd/7LZwNUiBl1PTJqKVutUCYsI+uZn/spCZ5UNSy9f9ZXeflm75Mhs0TnXnibcDk2cxCbkiI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161377; 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=vPzV+uPWJYT7YIBW66vZ+UEujk78jiwU1KYzVOdvzcQ=; b=L/Zs6ImjtQt8mgbMOHR4JakiGI7pqH1iJuTsrBGTEqsOg2eiLgCMQ309iAl4mEUFRc/Da5YSywl8aZn4yKxEA8nCAgfh96/OZ0gEPQy8H6z39AMHs8CoWeUyzd/uMpuyG0lIhftG5Rns5r7PkRTRWXD1WzDRSbY9MisKekwyFrg= 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 1616161377443834.6651569767139; Fri, 19 Mar 2021 06:42:57 -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-7-5lLBPPGXPlW8nxYAJU4OWQ-1; Fri, 19 Mar 2021 09:42:51 -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 1102A1013724; Fri, 19 Mar 2021 13:42:44 +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 DE50C5054E; Fri, 19 Mar 2021 13:42: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 8E88450052; Fri, 19 Mar 2021 13:42:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgbRh020601 for ; Fri, 19 Mar 2021 09:42:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id D60765944B; Fri, 19 Mar 2021 13:42: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 288B84F3C6; Fri, 19 Mar 2021 13:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161376; 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=vPzV+uPWJYT7YIBW66vZ+UEujk78jiwU1KYzVOdvzcQ=; b=V0jN6ZAzftiOWg0UC6LnstZCEDF8r+OpvNJC+LoW14z8+wghr9OV/uYnm5XNwIjIZkLYQD 8S9BdK2wUNkuvB4ZFeMRzuXdgesys1zuaqVRjyt6xMBDBpPi5JCEgUlal3jco53Z/qZ1Rz knYEP9LbzVevIX2IAWRHUI4p2IdbNMQ= X-MC-Unique: 5lLBPPGXPlW8nxYAJU4OWQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 35/51] domain_conf: Use virXMLPropTristateXXX in virDomainAudioDefParseXML Date: Fri, 19 Mar 2021 14:40:49 +0100 Message-Id: <20210319134105.442774-36-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 17b8cab707..976bdb0172 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13970,23 +13970,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 Tue Apr 30 19:40:33 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=1616161379; cv=none; d=zohomail.com; s=zohoarc; b=WlLmZ1ytIa9FgigT6e92U4VQKzuKxH+ta9E7vSSSltIJPgTRvUltQ35XJUUujiqr87knybzSNS8XEfLwu5bCq4e34wWeYWAS5UgOCvVAAIhBJX2FrMXTwhvW9ESY4YW9vjKffKgVKLE4RZmAgKZerw0Q6vRIsOmZxrsn5idt2Yc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161379; 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=KNYWawZjV04udPScy/4y3izF5baIDPsSd7823eKh7sQ=; b=ZAJXHLXCbN+5qKDxEcW2w1f6JEWjLnT5/VsscpO6in0SexYctms4M3YRZDa+vxqEjZc8TdI2KILp5rP71j7cE6NBoKkD0/2bkcQrK5BSQ6ICRKMrPGsBUGQaYeCklZYc804fRBPKvLJO74mb6pnQE/03fLWzX/dOZ+Rhb62ggpk= 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 1616161379207126.8791844075107; Fri, 19 Mar 2021 06:42:59 -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-415-sqiANeVcNom7M4xsH3u14A-1; Fri, 19 Mar 2021 09:42:54 -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 593E1107ACCD; Fri, 19 Mar 2021 13:42:47 +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 2AA8F1992D; Fri, 19 Mar 2021 13:42:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DCE4E1818463; Fri, 19 Mar 2021 13:42:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgd8e020610 for ; Fri, 19 Mar 2021 09:42:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 023D659452; Fri, 19 Mar 2021 13:42:39 +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 475BA5944F; Fri, 19 Mar 2021 13:42:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161378; 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=KNYWawZjV04udPScy/4y3izF5baIDPsSd7823eKh7sQ=; b=ABQ8jIa6ew2iU5e24BSSCFlTR82swpsG4jhdc8HUY+6mQEQ5fV/QuY2xprwekGRaKsg/lA 98adUfObccKUwm1rE0XyFSM8QwDO+HEq3f6pxdoYtW95dVzr2Zi/64WEyWTXDyXdrOOInc iykcBf+sUnVwy0ZKmiXqzlLFup/FRBw= X-MC-Unique: sqiANeVcNom7M4xsH3u14A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 36/51] domain_conf: Use virXMLPropTristateXXX in virDomainMemballoonDefParseXML Date: Fri, 19 Mar 2021 14:40:50 +0100 Message-Id: <20210319134105.442774-37-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 976bdb0172..72c98cc5a2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14212,8 +14212,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 @@ -14230,19 +14228,12 @@ 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); + if (virXMLPropTristateSwitch(node, "autodeflate", false, &def->autodef= late) < 0) goto error; - } =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); + 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 Tue Apr 30 19:40:33 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=1616161373; cv=none; d=zohomail.com; s=zohoarc; b=INHva5pa1tMkjqeTJUe1llC8gLoS3g224CnTItVWjcrlOMzFbATYdH5UnZVRmcqqUarQj+O2krwuer0j/ADvPXjKCKuvU9V5xuR1xKcTYudhMGapU29GfxdEH7yVT2gJbmJUEzayAUHttWul5fw+FZbciNvQaeaGVZpGBtLrYGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161373; 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=Oo0hknYeqKqFBu7MIf/AHDXodj8RWCgjv2gLA8Ac5No=; b=mst3rTeQHBjiQOZTRlg8i4IkYte/O6yR55m/f02hnxUX35wIzmghytZoJ45ExqgV+8eSoJiv3esComzYJweOlRcQSAsE2AubiqcsMctU40hJYB/uV16gibWtVP0fkRquYqjjPYJuFcMoQFv0nRMzX17xS6avIGP0mp4Gd98OPGo= 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 161616137374243.972670864865336; Fri, 19 Mar 2021 06:42: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-63-DNeMPP3xNzmZVQKv3Naz0A-1; Fri, 19 Mar 2021 09:42: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 B8156190A7A2; Fri, 19 Mar 2021 13:42: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 82D3919C79; Fri, 19 Mar 2021 13:42: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 2E9A050050; Fri, 19 Mar 2021 13:42:43 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgeNg020620 for ; Fri, 19 Mar 2021 09:42:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 107B159452; Fri, 19 Mar 2021 13:42:40 +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 56B4963B8C; Fri, 19 Mar 2021 13:42:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161372; 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=Oo0hknYeqKqFBu7MIf/AHDXodj8RWCgjv2gLA8Ac5No=; b=CP5Rt8Ag0bwSDUknL6gSmI13MTZRdianq9wsJiGCcaYBy48ULRqjQUkVI//AfSAv7CuVQb lKus0Dz+4/798doFG+UNjh/Gw2mVDEcpD2YSKnv042KXK7xybxvBPmoJictygtHRzGc4om +asM6xJMNcBFwrGrHS+lAYlnEHCdTos= X-MC-Unique: DNeMPP3xNzmZVQKv3Naz0A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 37/51] domain_conf: Use virXMLPropTristateXXX in virDomainShmemDefParseXML Date: Fri, 19 Mar 2021 14:40:51 +0100 Message-Id: <20210319134105.442774-38-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 72c98cc5a2..8ca6cd2e44 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14359,17 +14359,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 Tue Apr 30 19:40:33 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=1616161468; cv=none; d=zohomail.com; s=zohoarc; b=A0ySeUy8t7brk32wWEzRt/awmsmuaYACFebLY+MEnRADSDD4a9cij1O3gLPBxJFDWJ2sVm4y27/mjvzmCXuAbMHxbfButt9Mdj7uqlBU5XicRuf1hGiwKgcmTRIb3y+VobxtUP6Y1rqRCvIJTf/YuVlNKgkciZ/icWMWv3hQlqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161468; 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=tXp0MlmLUUamlB3PlU6DsCPrnti9ir56s0SA6t5CG2g=; b=cTF2VCqwS4zY4YXMibozOtQr4j5zB+zdoTQPC4xXRG0lTN+GYuyc5Mas4U1CvBXYep8bmTZrWdtO/8u10KTXMpLWyFTq7ATOIWvuF1i+sorEBjJWAZUSDsnnDWaF9GuF0Obd0lpRKeMOMyA55y9Tmw7CXmfbaToU028IiEFYXUU= 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 1616161468439660.0944590204157; Fri, 19 Mar 2021 06:44:28 -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-249-GsgZ5es5NWSU4TBp-qMPGw-1; Fri, 19 Mar 2021 09:42:59 -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 CCAC75A097; Fri, 19 Mar 2021 13:42:50 +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 A48596E51F; Fri, 19 Mar 2021 13:42:50 +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 3F98D50059; Fri, 19 Mar 2021 13:42:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgfTB020643 for ; Fri, 19 Mar 2021 09:42:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 25CD359442; Fri, 19 Mar 2021 13:42:41 +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 6418F63B8C; Fri, 19 Mar 2021 13:42:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161467; 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=tXp0MlmLUUamlB3PlU6DsCPrnti9ir56s0SA6t5CG2g=; b=RSPLChvbC6hlJx1KVzr6qeYsAWl3nwdTlgWbGhiQGFVUv2vKmo+XSAFRwaVrmXUVp/Lvo5 aXnBdYEpEX0meGeg4tKt/0R1FLITFOx6BY+Z3lKTb/IXE2NdgkspSv0zijSjmOU46AYnHC tVEIkN90rtg78jeZzLI73nQ8voxuwmQ= X-MC-Unique: GsgZ5es5NWSU4TBp-qMPGw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 38/51] domain_conf: Use virXMLPropTristateXXX in virDomainPerfEventDefParseXML Date: Fri, 19 Mar 2021 14:40:52 +0100 Message-Id: <20210319134105.442774-39-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 8ca6cd2e44..ef1f930a96 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15443,7 +15443,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= ")); @@ -15462,18 +15462,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 Tue Apr 30 19:40:33 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=1616161377; cv=none; d=zohomail.com; s=zohoarc; b=BN+TCbnZEJ/NinhEVhJyO0g4TTRbtSHajjbwNKBNq2yP5vhFd0ghO3PmSm4kARpLpyRYcYrr264wDupUv1us0ixL/7bF5PfJef4L4PFihPTEXMu/3wyiCAC3RtfDS0umGvoL/sP+OO4oPM5Vufj7beMtTKeyVqcNCuLVbyeF5mM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161377; 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=XvEVPdYiE0RoKQMj2v7kR29wCsReiocky7Re27aFOd0=; b=coQBHpqu07fje/on68zgpxFc7OyZ+mNloqmn49SZ0MN1cbmcayCqlDyPbzj7YXFIgas1M96zwE4ohKsyYc7O5yNubRfohSLRcDMufYWa4YoJxXJktyDjm9BoUFNii1xH6h0n8ffUM8iMFdCwpVoqD3UTkfoKBhWN+uxE+w3K4f0= 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 1616161377379211.51847744224597; Fri, 19 Mar 2021 06:42:57 -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-285-EkIGiCpBOVGCkpHExM7P0A-1; Fri, 19 Mar 2021 09:42:54 -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 1FB1C1013723; Fri, 19 Mar 2021 13:42:47 +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 F08355DAA5; Fri, 19 Mar 2021 13:42: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 AC126180213D; Fri, 19 Mar 2021 13:42:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDggjH020656 for ; Fri, 19 Mar 2021 09:42:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 31AD659446; Fri, 19 Mar 2021 13:42:42 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id 766BB59442; Fri, 19 Mar 2021 13:42:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161376; 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=XvEVPdYiE0RoKQMj2v7kR29wCsReiocky7Re27aFOd0=; b=FtzjWAOIMnQZz+dcpCT/eAbh85a82UGKB6qT/ObfGmbaGVlPRdXz76z3fRwrdBXmqBslID 2NkIn0N4NobdkNhmxvZjT0Qri18ByChvOGlEXJ3ngoMCRrp1JMf0S8D7+HN1ejbsLm/+9/ m/xoI9Jc4IBEg3bG+MXSSWWBx+5uD5E= X-MC-Unique: EkIGiCpBOVGCkpHExM7P0A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 39/51] domain_conf: Use virXMLPropTristateXXX in virDomainMemoryDefParseXML Date: Fri, 19 Mar 2021 14:40:53 +0100 Message-Id: <20210319134105.442774-40-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 ef1f930a96..3c69f3913a 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15706,16 +15706,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 Tue Apr 30 19:40:33 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=1616161377; cv=none; d=zohomail.com; s=zohoarc; b=cEjIqjxLNs0RniHtk8fTvz+IUtSJT1INAy5H3TujdRtqj24sG1McJTT6ZY3vSslkGU1Guy1l2AGKxfDW2WPgw0szVtUxff4lKLdDjX2+Uv2EW1jotDBYqAyEffzs0GLNatteP/xjo6sTGU/u+TQvBTh47CEO67ZYqIp8PbGwFl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161377; 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=TYzIEuSqWhDKD7EXvU75nDqmunp5N+Q7IkFnr0mBYCU=; b=n+okWSFAegRNA5oTzkEa19PaSh2kQbgn4Fe4Mf5/KSDZNbKS2XIzfF+UfhEMISvvi7qTWMNpneZ5vVgop5hO0K5ZncWYiQ7YFaBPVUu4m5rGInvSvM7ycNhcFk1HTVoE04vcO0ss4fjjLu4mg7khVMl7RrS5oEsNmKckxLr4Lzg= 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 1616161377151193.0374403036601; Fri, 19 Mar 2021 06:42:57 -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-524-EdQL08CUMlSEaf1k4PabQw-1; Fri, 19 Mar 2021 09:42:53 -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 F2A52101372C; Fri, 19 Mar 2021 13:42:47 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CCE7B5D743; Fri, 19 Mar 2021 13:42:47 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 8D1CF50056; Fri, 19 Mar 2021 13:42:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgheB020664 for ; Fri, 19 Mar 2021 09:42:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3E38D59442; Fri, 19 Mar 2021 13:42:43 +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 8318B2BFE2; Fri, 19 Mar 2021 13:42:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161375; 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=TYzIEuSqWhDKD7EXvU75nDqmunp5N+Q7IkFnr0mBYCU=; b=S2dczH/bcgUhESOQ1fnLARn1R7v6tRxzQ4x57rZFoS1xc9EC2x1ocne1kMsnDTWxbTgOrq IJg8YOCBY1d7BEGG9zywSnPZOB+dZeWYsXR4gH4O+vOQsWkLrVdhhz3ULU8nGNMwSQX9db fLMvC5o37srFQFMyGI5mCppRbOpaYrc= X-MC-Unique: EdQL08CUMlSEaf1k4PabQw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 40/51] domain_conf: Use virXMLPropTristateXXX in virDomainIOMMUDefParseXML Date: Fri, 19 Mar 2021 14:40:54 +0100 Message-Id: <20210319134105.442774-41-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3c69f3913a..4bcae93c37 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15777,40 +15777,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 Tue Apr 30 19:40:33 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=1616161379; cv=none; d=zohomail.com; s=zohoarc; b=S4fUqZOV8UogxYJ6+lpxBE3Flu7KjI0ka5iwRUT1VbqFNPSd0SNomJv7ldzw5Q/SO/eY7Ot07sJA0jGAJ6oaN790dRZu+WajwDmIIADcnCQ+8DQ8fA0MRrQv4cxjTY1euWxuT3lvYtmrADBD5o3hE26cPrk5rqttjES9zMtQLH0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161379; 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=CG1Aqbne+ac/2NT4NbH9hk5GpYrn8W1DzlP6YMkcxBg=; b=YzgAOh5PmJTbVny4cpaLo92kM3XGYo4Xp4qMjvmX/IX1kAuC7XXYMZn9L0lwcJn/pZzFaYCWEgXy57eXgAmZfGHFrXOLkCL0mm8Zn78gJOsM32fxLFlrFgTOARmIXBiVy75S9KtMw0+1OGIybqSk7SgUTSZSqXssjeh48gdeJnE= 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 1616161379593581.1707003929853; Fri, 19 Mar 2021 06:42:59 -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-48-a0V89DHOM0mb7laoq4VJKw-1; Fri, 19 Mar 2021 09:42:56 -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 9D0FC593B7; Fri, 19 Mar 2021 13:42: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 76E065DAA5; Fri, 19 Mar 2021 13:42:50 +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 2EF3B1818468; Fri, 19 Mar 2021 13:42:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgiNP020684 for ; Fri, 19 Mar 2021 09:42:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4BF6D59452; Fri, 19 Mar 2021 13:42:44 +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 910C55944F; Fri, 19 Mar 2021 13:42:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161378; 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=CG1Aqbne+ac/2NT4NbH9hk5GpYrn8W1DzlP6YMkcxBg=; b=FbEpyXaASaMyslDClqW6yv4/KE5X6KdrU/+WR+Aq4DjwflmsMpAWtDC/nX1sezP7J794Er EzQTrvp+/WQ6k3ywLI4W5qoIRyDX9b5jF9wT77suD+rg1OxwkskMxLxukBFRUZ5i6kPFef kpQu5eV3BnYz6ZTFGVt6ePoIyLGVjdw= X-MC-Unique: a0V89DHOM0mb7laoq4VJKw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 41/51] domain_conf: Use virXMLPropTristateXXX in virDomainVsockDefParseXML Date: Fri, 19 Mar 2021 14:40:55 +0100 Message-Id: <20210319134105.442774-42-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 4bcae93c37..418e86ebcb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15842,17 +15842,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 Tue Apr 30 19:40:33 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=1616161385; cv=none; d=zohomail.com; s=zohoarc; b=XOoKeHi3ZEinhewAeLJHcFQH7vpHuK/Pk7J6GwhupHnAxrvKvMZ6s7Pd3phqQ2DStFX42Gv9xEjLHCLDrnXfkfaU5JW8LJ9zZLZxGCGwwv3smINEOt1etsbv1O5Z/NLLMPHbSU3gKbdIh+XsFMLBDkxqRaLNTiIgGFbfYNRReik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161385; 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=hkud9cQMYcSTmhXytkHGuDzOgErkeVOCEukOfGBJB/c=; b=hGqLyjpXGA71FJU98jNMHu1zvMfw+22jhXfcd2xIReUlA6AsC51rkmhCh0g97TGOcB8K8k89On9hVA3dapS/S9nQYveJp4QDxO7EVJu8Eahf9skVyG0zK39lK8DgH2V9PJMbw758wkeGh8UXOKd9NtPqLN6Av17aTryDdNx6wbw= 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 161616138526029.14803046031568; Fri, 19 Mar 2021 06:43: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-376-KC_FLQ4MPYGePXfbDllMNw-1; Fri, 19 Mar 2021 09:43:01 -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 1EB2E5B372; Fri, 19 Mar 2021 13:42:54 +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 D8F2F10016F8; Fri, 19 Mar 2021 13:42:53 +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 7A546181846D; Fri, 19 Mar 2021 13:42:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgj20020699 for ; Fri, 19 Mar 2021 09:42:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5BF1459448; Fri, 19 Mar 2021 13:42:45 +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 9DEC463B8C; Fri, 19 Mar 2021 13:42:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161384; 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=hkud9cQMYcSTmhXytkHGuDzOgErkeVOCEukOfGBJB/c=; b=GLd8s1C8F7i98lMZaCE5yh8+v13/HuXGvkUrQo0CjVkO2sJ0Matau8Y/v/CxJNOmMineHg Vew/hUbFMSyrxJTRFUzRcFQLC22+cogqCWlPPY2jxZQ18WRBgL1f2x3xni7Sgvltfsg0Y7 Y5MkChN65OpusebrUX2+ytIPbVQwADY= X-MC-Unique: KC_FLQ4MPYGePXfbDllMNw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 42/51] domain_conf: Use virXMLPropTristateXXX in virDomainFeaturesDefParse Date: Fri, 19 Mar 2021 14:40:56 +0100 Message-Id: <20210319134105.442774-43-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.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 --- 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 418e86ebcb..83fc12c41b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18237,6 +18237,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, @@ -18246,16 +18247,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: @@ -18287,16 +18280,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: @@ -18404,18 +18391,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] */ @@ -18427,13 +18405,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, @@ -18444,23 +18421,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); + if (virXMLPropTristateSwitch(nodes[i], "state", true, &state) = < 0) return -1; - } =20 - if ((value =3D virTristateSwitchTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid value of state argument " - "for HyperV Enlightenment feature '%s'"), - nodes[i]->name); - return -1; - } - - def->hyperv_features[feature] =3D value; + def->hyperv_features[feature] =3D state; =20 switch ((virDomainHyperv) feature) { case VIR_DOMAIN_HYPERV_RELAXED: @@ -18478,7 +18442,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, @@ -18497,7 +18461,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], @@ -18534,13 +18498,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"), @@ -18548,33 +18511,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) { @@ -18588,23 +18539,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); + if (virXMLPropTristateSwitch(nodes[i], "state", true, = &state) < 0) 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); - return -1; - } - - def->kvm_features[feature] =3D value; + def->kvm_features[feature] =3D state; break; =20 /* coverity[dead_error_begin] */ @@ -18617,14 +18554,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, @@ -18633,30 +18569,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"))) { @@ -18726,7 +18649,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, @@ -18734,16 +18657,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 Tue Apr 30 19:40:33 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=1616161385; cv=none; d=zohomail.com; s=zohoarc; b=nVdl+AgK6vpKvdL4VztES7sxNUz4wYMCTQyft9/Eqen8ZU3C0XM6YJmvuqkmdLvzEf7ci7cbvLnezPt7W4RG8xcXM2FmpMNmjG1liSQwdXEsMT8YircSeW9ixLa/z3CVztJ/+7RzeoNHsQGw9BrFk+dIMgjKUGNeXrQkpQwQ+aQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161385; 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=9/SjquvNsQh+39dddFA/3MYsm/3PnlETqfBsqYEnB2E=; b=AknXQ/da0GJNsrkh6U9w5PAu0Q/doRjZh1IUZEyyapDs2Fb0fhonXNRbSgfSo4dTA+jANpGUO+FkooTx6giv2EPs9cM5+xemOtLvsJ0ntZrtAf9aSjECeilFM3Pde2nza0OyJfC91+AngPjYggFZtBU1L3OzkYuH0CDIwEFasLs= 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 1616161385791355.19016246200033; Fri, 19 Mar 2021 06:43: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-120-T78HBsiMNTe5L5KZ9tP6pQ-1; Fri, 19 Mar 2021 09:42:57 -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 46F75881287; Fri, 19 Mar 2021 13:42:51 +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 1EB8B5D6D5; Fri, 19 Mar 2021 13:42:51 +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 CB75F5005D; Fri, 19 Mar 2021 13:42:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgkFg020710 for ; Fri, 19 Mar 2021 09:42:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 67ECC2BFE2; Fri, 19 Mar 2021 13:42:46 +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 ADE7259448; Fri, 19 Mar 2021 13:42:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161384; 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=9/SjquvNsQh+39dddFA/3MYsm/3PnlETqfBsqYEnB2E=; b=FRd4XSGiUSLEXLlSiYEvxY0j3PMhl0Z6noZLFLenWqz8rNRZg8JuC/35D9ZekSV1TIBLZ8 euigGrT9zt0jzVlw3JQwizi9Q4bxkUU1xsdPgeaxAobY0pai0lN7lA6tSAawqqIgWqPZ7z kMEyzoVffxJ6VlfoZENN5Ai83lRmPNY= X-MC-Unique: T78HBsiMNTe5L5KZ9tP6pQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 43/51] domain_conf: Use virXMLPropTristateXXX in virDomainLoaderDefParseXML Date: Fri, 19 Mar 2021 14:40:57 +0100 Message-Id: <20210319134105.442774-44-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 83fc12c41b..6c4595fd20 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18713,14 +18713,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; @@ -18729,19 +18727,8 @@ 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); + if (virXMLPropTristateBool(node, "secure", false, &loader->secure) < 0) return -1; - } - - if (secure_str && - (loader->secure =3D virTristateBoolTypeFromString(secure_str)) <= =3D 0) { - virReportError(VIR_ERR_XML_DETAIL, - _("unknown secure value: %s"), secure_str); - return -1; - } =20 if (type_str) { int type; --=20 2.26.2 From nobody Tue Apr 30 19:40:33 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=1616161389; cv=none; d=zohomail.com; s=zohoarc; b=GOE6a9A8oqf6HufqjJzOIiwiTIMwbPLvOT7ltYGkg1gcBoQ/HJwrafGoN/iQmt6LwNZDhcOIdCF8bc0gtRNXTCVxJKM7n2magq6EAHXp5+IhHNTdu5SvdH85laAWkYABpPLjmLDnZnUP9Jn+1rxLsJ00EpgYxmr89ftGH2HEGoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161389; 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=gaZqroHRmgVr4vc/aEbU/QxfcwCm7cHYySxdX/OL7BE=; b=PJVxNMzB9ZbdfiRYHOkw+eYtolNLD2oYvfhxnlm2G7WNzHIa4D/NC0BLsMVrgPyxtQ1g2I7f/G3YCqSgJDQ1u+yAYq9z3kGv5l/aKNRkGSKIDDHepTwXUOD6FYwp7SY92oqwnZFr5R3LfhvHdtcUf9UMhvhbQ9kWt5IMx0ke9uI= 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 1616161388999722.6071607129783; Fri, 19 Mar 2021 06:43: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-493-AePpczvIOJ2i1Zrls68SkA-1; Fri, 19 Mar 2021 09:43:04 -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 772B85B373; Fri, 19 Mar 2021 13:42:54 +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 4D9E310016F8; Fri, 19 Mar 2021 13:42: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 0086F181846E; Fri, 19 Mar 2021 13:42:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDglQL020734 for ; Fri, 19 Mar 2021 09:42:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 744892BFE2; Fri, 19 Mar 2021 13:42:47 +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 B91C163B8C; Fri, 19 Mar 2021 13:42:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161388; 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=gaZqroHRmgVr4vc/aEbU/QxfcwCm7cHYySxdX/OL7BE=; b=MA99pdlzSeOu1jyYZ0zcG/NyUBQw2J+WjsWfN7nCyn8RkkK5Uk94r1GsBezZ7s5Pz7W0r3 ydhBsDyBYU0KdFcSyCQphIpIw2Bz0srhMrBXM7dbAjPrZ3P1wkld7sCFmcG4xuk8NetvLk nFZaCpcNq9QTCgb2gXNFK0fUfYVaYTw= X-MC-Unique: AePpczvIOJ2i1Zrls68SkA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 44/51] domain_conf: Use virXMLPropTristateXXX in virDomainVcpuParse Date: Fri, 19 Mar 2021 14:40:58 +0100 Message-Id: <20210319134105.442774-45-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.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 --- 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 6c4595fd20..6b9a5f26e6 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18999,7 +18999,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 @@ -19021,31 +19021,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 Tue Apr 30 19:40:33 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=1616161510; cv=none; d=zohomail.com; s=zohoarc; b=lQ0UhNKWpRR683mz7/MJeHlU+8Q0MbKc3jY0bJTJLUVly8a2wolSZBwGxblMVFKAuWAK7VQl+GDzvTOf9JpMg3TF+q0WisjU+nmmQBP2IuqM1V0G7QoJqO7bl4IE9/TrrXTAmfbp974iNyxy9OwvDs8zhKudYbY036JU/fKUalk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161510; 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=oBw95FwBiQEEeT4HLAx1ozaAkgva3yy9xqdJdaNZ164atRq3ePDJ7z9HyM8VjU+1t0Mfm6CUfB2JQ4HQdTxUGGXul6BntCvNXJQu34HbAoRwlkXIqMAsAe0YI5c3AIxWLGlNP6xgVQbQ4X0Lh8Ktk+TyP2M2hX5r7hgiezdeu/8= 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 1616161510563211.59257458324487; Fri, 19 Mar 2021 06:45: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-199-71nLOeUANjO9sxRb8jW6Wg-1; Fri, 19 Mar 2021 09:43:06 -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 D11F1881283; Fri, 19 Mar 2021 13:42:57 +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 ABC521803D; Fri, 19 Mar 2021 13:42:57 +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 6C65B473A0; Fri, 19 Mar 2021 13:42:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgm9n020744 for ; Fri, 19 Mar 2021 09:42:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7CE0C59442; Fri, 19 Mar 2021 13:42:48 +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 C67F059448; Fri, 19 Mar 2021 13:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161505; 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=DSE+XOqxLwMHDD+lm44q/ClvxEfl+GOQdKB/pmVwjH0/AZpYYcaQo2BgRa+UPQjzbnd/nh 509ek9WAwJk8Ir0cvi/oFeROTEj1aweDQZ3gZP6YhSzhF2vb8gx/5Rld2lCldk1XjkyUIy SoicwdcoRG70iZrIvfRVK2tlHRr+r6I= X-MC-Unique: 71nLOeUANjO9sxRb8jW6Wg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 45/51] backup_conf: Use virXMLPropTristateXXX in virDomainBackupDiskDefParseXML Date: Fri, 19 Mar 2021 14:40:59 +0100 Message-Id: <20210319134105.442774-46-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 Tue Apr 30 19:40:33 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=1616161513; cv=none; d=zohomail.com; s=zohoarc; b=SLAaGY7jpLAjdNIj3oBlRwF3SkhJBkWs6lCc2GUpaO5i833I4inkXLflcbCUbF/oka2foX6wYvMWczKV5O0ygBtOs8F26cKU0WUGFOht4kn3BdWY69JRWLV8TVQRh6lCw//WdOYKG7xz6x5lp40BO97XIc+1ABu5gNH7Z2H+400= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161513; 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=l3lHw1oBS8nJ7MM1VHXUk8mnudacWTmx/Kyw/yjGuOqINz1Ye5w7SOcHAn5JAQb+HoOMbbB5MpGH0KlM/i6iB+tj2nZRHhFxhZCn9mhmd3pFw0OoWpN0cNSoz6b7IHTmJzo7Yv1wzAmI8N42nv4Qb3DKJf3PQ2BBfTB7bBNudzk= 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 1616161513465115.61067967508666; Fri, 19 Mar 2021 06:45: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-496-v2IZKU2GMEyplNR_jZYlCQ-1; Fri, 19 Mar 2021 09:43:10 -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 D26A510866B3; Fri, 19 Mar 2021 13:43: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 292E758899; Fri, 19 Mar 2021 13:43:01 +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 D4A27473CD; Fri, 19 Mar 2021 13:43:00 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgnvR020760 for ; Fri, 19 Mar 2021 09:42:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id 836AE2BFE2; Fri, 19 Mar 2021 13:42:49 +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 CEB0359448; Fri, 19 Mar 2021 13:42:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161511; 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=CVMdpqbDlx3pmEzNCn/95i2qGFirTo1wb4jtXFe7Hoj7rKv4Fx4Bw0kxS8Q8DBYg98upDp Z3c19R5OOgWgHqGh8q6lS/Nt2YRE2ajXn778x7CC8uLBA9TwjAm90j9H5mbE+euNlzGuZk slV/daETkuKq2YBJHHVIu47xFzkLd60= X-MC-Unique: v2IZKU2GMEyplNR_jZYlCQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 46/51] backup_conf: Use virXMLPropTristateXXX in virDomainBackupDefParse Date: Fri, 19 Mar 2021 14:41:00 +0100 Message-Id: <20210319134105.442774-47-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 Tue Apr 30 19:40:33 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=1616161449; cv=none; d=zohomail.com; s=zohoarc; b=oGgjZl0KeuwTXeEHGW9JCAOryf1IXAEQ9rbVpT/cx24ycnUWp2R8q6mNuqk4pXbUtNptYcPlSZoUPkY9N2WjzYezaeTeRsnBdRlUQZxhOxoDJcx/GnFfhsGEzMYF6fSlbkPQS20tyPu5xkJkqRunvWylVkljcdE2UYuLubRu8N0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161449; 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=OCNTU0ZMQW8QB0rPft7Gj3OxN2fleSfStGcO4GTFR1I=; b=kkWJMQTPYsLB+BXR6h/ZWyFWcoTpHQV0M1G2K+hdAhfHybv6Dh4lqgYebig3NaD88GiKAkkS45ks8eFlUswTfYKRNtrvvAh+jocGKzbOp4yUQzg8fxB2+9sEkWIi7KMKjmQ1+zXbtpAt1CWFvhpfeuiVTYU384grg9yiVlThcig= 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 1616161449457445.80067667054595; Fri, 19 Mar 2021 06:44: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-5-D2NpOPvkML2Ka84AKAsErg-1; Fri, 19 Mar 2021 09:43:04 -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 84CD5190A7C6; Fri, 19 Mar 2021 13:42:57 +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 5E298610F3; Fri, 19 Mar 2021 13:42:57 +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 1780F1818470; Fri, 19 Mar 2021 13:42:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgtn1020814 for ; Fri, 19 Mar 2021 09:42:55 -0400 Received: by smtp.corp.redhat.com (Postfix) id C30512BFE2; Fri, 19 Mar 2021 13:42: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 1091A690F3; Fri, 19 Mar 2021 13:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161448; 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=OCNTU0ZMQW8QB0rPft7Gj3OxN2fleSfStGcO4GTFR1I=; b=TtO6PTZZOoEIpr3HVclN9j72/s3x5VILnI6/VAZAnwl4zz33u2qC3QlNXhuSbLg8NkVH0/ 5I/WixtXIKrU9vAYRNQMRpl6hJKiaa6pKYNPYxUhqa9D/fZ0l/zYmMGjZklP4Vs/5cdvOQ ZahR+nK1SlMx2RZhp7uvM8wzPaitn38= X-MC-Unique: D2NpOPvkML2Ka84AKAsErg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 47/51] device_conf: Use virXMLPropTristateXXX in virPCIDeviceAddressParseXML Date: Fri, 19 Mar 2021 14:41:01 +0100 Message-Id: <20210319134105.442774-48-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/device_conf.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 714ac50762..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,14 +245,9 @@ 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); + if (virXMLPropTristateSwitch(node, "multifunction", false, &addr->mult= i) < 0) return -1; =20 - } if (!virPCIDeviceAddressIsEmpty(addr) && !virPCIDeviceAddressIsValid(a= ddr, true)) return -1; =20 --=20 2.26.2 From nobody Tue Apr 30 19:40:33 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=1616161443; cv=none; d=zohomail.com; s=zohoarc; b=MOZE5R7NWCkTEmUA9mR864cmidPcVI0PWiKkGORCZ+R1yz+m4rr+vvzv1bWxNWaYBvdpI5JdV1j8af3yyOT/LzkIkFsgyoNrmhHeWnwf5yxzriPVn/MQrLKvZAaYdD8Z+6fjicxWy+Luc2pS9mnsuU58+U3hrtnTKHRPiVXucyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161443; 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=Re4LtgaoFe7h6/nnQWNxw2B5co71s4cjOumC9mJPyM3MqikOFinipH+N9mob+SaZTlEb16C2gKNEUyqAriRsUx2cxHYjdJOp+9fveHtedcJ5oqBUCxyrqSXMIsfFZyuvQzIqASCZ5Osbh3s649IJBcUs/0Egv++aVQ2gKZgBc34= 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 1616161443381292.68656109767846; Fri, 19 Mar 2021 06:44:03 -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-367-7SOr8uMNM_-f54yVfePogQ-1; Fri, 19 Mar 2021 09:43:12 -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 2FEFE83DD32; Fri, 19 Mar 2021 13:43:05 +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 EF98B610F4; Fri, 19 Mar 2021 13:43: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 86EFC473D0; Fri, 19 Mar 2021 13:43:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgurD020827 for ; Fri, 19 Mar 2021 09:42:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id CB72259446; Fri, 19 Mar 2021 13:42: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 208E92BFE2; Fri, 19 Mar 2021 13:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161442; 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=J41NLelM8c5a7eZPN+MnV8YxKh8frTo087KmPWKggDAqotPM6HXKRKD0eKhQu3u8x+tlm9 r/aYuQOz2bd+07QYkDlveLNtvBv0JuAiOfjYPuZxhrl9coRPnM51nlEWT3ywEA/BANn/Pl IIwSPDjCdG+zKEcv9wupOGxg42vgfH4= X-MC-Unique: 7SOr8uMNM_-f54yVfePogQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 48/51] network_conf: Use virXMLPropTristateXXX in virNetworkForwardNatDefParseXML Date: Fri, 19 Mar 2021 14:41:02 +0100 Message-Id: <20210319134105.442774-49-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 Tue Apr 30 19:40:33 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=1616161456; cv=none; d=zohomail.com; s=zohoarc; b=gqXVOKWpzKoTiKcshSapJQ4z/GdI/m3ZfXJ31RNL1euZLGXFjh4PPeO2Y/YZI8hO+283uPmAZdwB02lwz0sYOnIzBcop8qvOeZnDwVALfP5i/qXhRUsFWnmkCm7JJBD+nM1g0B31knHmuJn3ti4I185TCpq9pgOnTrVEeN79rOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161456; 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=c70qz2pmOXfoHdZeNkdaWdIH6Od3JVRGiZzcXK8DBAURVDECPi+GJiimSvDhLtTIwis7F2mP3lqFn+4bQmpea0QdzNU3yu5+0OiylMwZvwUyhaCxZRcwAWdN1muol4W8K9LF9btpSvLtaiDkAJy3l9bujpEebdEDMsnKSdkDTag= 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 1616161456793246.96996890428466; Fri, 19 Mar 2021 06:44: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-307-Oe5Ciy_8OCqjC3Hg2byX1g-1; Fri, 19 Mar 2021 09:43:09 -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 D453983DAA3; Fri, 19 Mar 2021 13:43:01 +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 582D1764F3; Fri, 19 Mar 2021 13:43:01 +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 0DE311818471; Fri, 19 Mar 2021 13:43:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgvi9020849 for ; Fri, 19 Mar 2021 09:42:57 -0400 Received: by smtp.corp.redhat.com (Postfix) id D72D959446; Fri, 19 Mar 2021 13:42: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 2832D2BFE2; Fri, 19 Mar 2021 13:42:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161455; 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=hTE2PLSf303q4OGBxPcn5fnUooXo+LgEOrLHoEjl73zk83s2sKBP60SC03C5C8u1yzH/FY Ok9W9oVoIGF2J/tUYRUmIRD8UuaUtcpVrellwf/A3t+qdyJPwoFyEM8eeOV6ESvK1iaotg 1J/2WsfCaglTwMih9ERAL8AN+3k1cxQ= X-MC-Unique: Oe5Ciy_8OCqjC3Hg2byX1g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 49/51] numa_conf: Use virXMLPropTristateXXX in virDomainNumaDefParseXML Date: Fri, 19 Mar 2021 14:41:03 +0100 Message-Id: <20210319134105.442774-50-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 Tue Apr 30 19:40:33 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=1616161454; cv=none; d=zohomail.com; s=zohoarc; b=mbVGjqV3E01d5wEKzLX3O9zpgH7Sv/qU5rzGKSzw37dicyVshbQunSdYhitxp9gtoH9nOsFS7e+iIFjjTxJ+1N9zbu9IrCYaHj0j+K3uHJpQEEKzybiRdofwwJa04ifcXayUhrjLNhnoW+33gUkOh2PK7fN+CshcWBHnYo8vkRs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161454; 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=XgRXzfmhOGRzt1ABxFzhrKnUdSDr1RAqJNXSgatYBFTcTxBO8VjCN3x5eOqAPTQ3ThLYo9iuAIiyMZ1KZIvF0EX7CikYiOAaMJ02xsJ1LPDAn4/7wgFBIvQtFnEi+DM3htZ/8NvVSeM7kyBeN4eOqMaRohzbMO0eZy8byUBv4SI= 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 161616145489399.26366519433623; Fri, 19 Mar 2021 06:44: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-137-YinK85N-N_6Y7sRlNZc6ow-1; Fri, 19 Mar 2021 09:43:17 -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 0A46610866AD; Fri, 19 Mar 2021 13:43: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 CEDD55C1D1; Fri, 19 Mar 2021 13:43:09 +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 726921800216; Fri, 19 Mar 2021 13:43:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgw1J020857 for ; Fri, 19 Mar 2021 09:42:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id DCFC559442; Fri, 19 Mar 2021 13:42: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 3361C690F3; Fri, 19 Mar 2021 13:42:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161452; 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=C/9IDiX4dnASynO/kt1cESLkfXfyDOJigSad7M2DqIwB8E2H62ImwrsgB12DmvHJVVgbZe 1j8b1n8WW66eMAr591UU3PisE0ZadXeL7npSL3YE8s8frRXdsbaFtSy/iiwvvyH4kp4GGG E8F0KMC+P6o9B/L86KltPbhABI+NPEo= X-MC-Unique: YinK85N-N_6Y7sRlNZc6ow-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 50/51] storage_adapter_conf: Use virXMLPropTristateXXX in virStorageAdapterParseXMLFCHost Date: Fri, 19 Mar 2021 14:41:04 +0100 Message-Id: <20210319134105.442774-51-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- 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 Tue Apr 30 19:40:33 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=1616161393; cv=none; d=zohomail.com; s=zohoarc; b=TANY5akKHySfNk89ZCsJBbHSSxIg1fmejXai4Li71qXQR/r2n8hxKCotcg99VN2EkqmQHoOS3xYTYvwMETdZKgouwABRwMrxgtkbfqOp5H3eD2NY46WsWvNPReI7SEa8mNgr0NWiAf/Yp9UT6tiy14eoLon66rlKKbLP8JZd9pU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161393; 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=4unfV7oopxe6HztPJDanD0eOpKMuB+qjo09IvotyOEY=; b=mvVI1aXpQ/Zv3W2C5vO0IZewNZnJKgG8ajsjJ1zSnmVfl6zy5R4mj8nWWL/gEuPpN3XC38D3KYfBlGkUFgIRdZND3PgyGR8MCKOkE0a9y+6i24kZ0An8ayy+h3RwcRmAbQnroCwktjH8a0p6eMMLRNKcreVQu5U5EddQi4Kb4JI= 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 1616161393430609.6284342750923; Fri, 19 Mar 2021 06:43: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-248-_LrQmuLVNb6KoXPjZOd99w-1; Fri, 19 Mar 2021 09:43:09 -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 D3E681050477; Fri, 19 Mar 2021 13:43: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 A9A8D5C1D1; Fri, 19 Mar 2021 13:43:03 +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 5D2D51818474; Fri, 19 Mar 2021 13:43:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JDgxW1020865 for ; Fri, 19 Mar 2021 09:42:59 -0400 Received: by smtp.corp.redhat.com (Postfix) id E381359442; Fri, 19 Mar 2021 13:42:59 +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 3969E2BFE2; Fri, 19 Mar 2021 13:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161392; 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=4unfV7oopxe6HztPJDanD0eOpKMuB+qjo09IvotyOEY=; b=eDIAu2V7UJUeuP6DDY/rKbxYLbwd6MmegPj39WIBqFy8is7ypr++AQRwT9Xu6CNkUDq2UM uNW0h8CEcm3b1WU7o0cXy+ZIPVIhlc1VSr0EQbKCoouerZAdGAXGLyzKx8JCNSoXHhkmj4 gnTAXUy5+mS5Tk7X3G7ggr2TekOv6P0= X-MC-Unique: _LrQmuLVNb6KoXPjZOd99w-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 51/51] storage_conf: Use virXMLPropTristateXXX in virStoragePoolDefParseSource Date: Fri, 19 Mar 2021 14:41:05 +0100 Message-Id: <20210319134105.442774-52-twiederh@redhat.com> In-Reply-To: <20210319134105.442774-1-twiederh@redhat.com> References: <20210319134105.442774-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 --- src/conf/storage_conf.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index fa8bcfb8ce..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,16 +614,10 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, goto cleanup; } =20 - partsep =3D virXMLPropString(nodeset[i], "part_separator"); - if (partsep) { - dev.part_separator =3D virTristateBoolTypeFromString(partsep); - if (dev.part_separator <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("invalid part_separator setting '%s'"), - partsep); - virStoragePoolSourceDeviceClear(&dev); - goto cleanup; - } + 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