From nobody Tue Feb 10 07:39:08 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1616169725; cv=none; d=zohomail.com; s=zohoarc; b=KcMtOldtniRu/ipIys4jNXubIcgTcNDnq3ZJev7QocZlQiynOv4i61TnP044HIUchJREqjiNJHDpRlLhR+1s46y9VN1VzFsEO3qtRsYeIovBxGo0vDxoWSmRzfBPoNwKAj5sJh8Uoq1mHi4cAaCREK2jGR9WxYPywpz8FpDqV5g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169725; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CCBXRmoVzOiEJubC5S124ggxD6Th1U2DaOqxu4s9AuA=; b=W32igr7ZEPqGramFYaf/Gv0ZPLdDg6s+eEdGHkwX2dNgp2e5sq086zAFlUsJ5s+Fvq67mfV4tlM+Xp7ceMTiBUxI0MCqxUh7mUEV6EQHpzIPsB3rL7G8QkyDRBTryO42UIia0mNS5Nar+9DvUx9xmMcJNprPt8GXKG6Gm2O8S34= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1616169725122783.1425381910266; Fri, 19 Mar 2021 09:02:05 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-266-fHgGGafjOe2Jseb3blRkjA-1; Fri, 19 Mar 2021 12:00:27 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ABFB5101F7DE; Fri, 19 Mar 2021 16:00:17 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 786DB6F973; Fri, 19 Mar 2021 16:00:17 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 1E2FB50048; Fri, 19 Mar 2021 16:00:17 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12JG0AWw007567 for ; Fri, 19 Mar 2021 12:00:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9FDDF1A353; Fri, 19 Mar 2021 16:00:10 +0000 (UTC) Received: from work.redhat.com (ovpn-112-175.ams2.redhat.com [10.36.112.175]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0B1D18E4B; Fri, 19 Mar 2021 16:00:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169723; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=CCBXRmoVzOiEJubC5S124ggxD6Th1U2DaOqxu4s9AuA=; b=GigflOyxoMvICOIkdib7/kYt55EANvMK+YOSNe6XkDNoq9141btzaPImqW5g9r4oNq8Wil caDof8kIuXDGjus2cplbjVBG20hLs7acrdUnjNWaDID5bzSo+93GkpQuahpWE/nOjg7uDE nQkOcak+tnW+w/+O+KMw9zFWWPpFSGc= X-MC-Unique: fHgGGafjOe2Jseb3blRkjA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 44/51] domain_conf: Use virXMLPropTristateXXX in virDomainVcpuParse Date: Fri, 19 Mar 2021 16:57:41 +0100 Message-Id: <20210319155748.680146-45-twiederh@redhat.com> In-Reply-To: <20210319155748.680146-1-twiederh@redhat.com> References: <20210319155748.680146-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake --- src/conf/domain_conf.c | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 55405d129b..97c7a3ec28 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -18998,7 +18998,7 @@ virDomainVcpuParse(virDomainDefPtr def, =20 for (i =3D 0; i < n; i++) { virDomainVcpuDefPtr vcpu; - int state; + virTristateBool state; unsigned int id; unsigned int order; =20 @@ -19020,31 +19020,13 @@ virDomainVcpuParse(virDomainDefPtr def, =20 vcpu =3D virDomainDefGetVcpu(def, id); =20 - if (!(tmp =3D virXMLPropString(nodes[i], "enabled"))) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing vcpu enabled state")); + if (virXMLPropTristateBool(nodes[i], "enabled", true, &state) = < 0) return -1; - } - - if ((state =3D virTristateBoolTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid vcpu 'enabled' value '%s'"), tmp= ); - return -1; - } - VIR_FREE(tmp); - vcpu->online =3D state =3D=3D VIR_TRISTATE_BOOL_YES; =20 - if ((tmp =3D virXMLPropString(nodes[i], "hotpluggable"))) { - int hotpluggable; - if ((hotpluggable =3D virTristateBoolTypeFromString(tmp)) = < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid vcpu 'hotpluggable' value '%= s'"), tmp); - return -1; - } - vcpu->hotpluggable =3D hotpluggable; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(nodes[i], "hotpluggable", false, + &vcpu->hotpluggable) < 0) + return -1; =20 if ((tmp =3D virXMLPropString(nodes[i], "order"))) { if (virStrToLong_uip(tmp, NULL, 10, &order) < 0) { --=20 2.26.2