From nobody Mon Feb 9 11:47:00 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=1616054570; cv=none; d=zohomail.com; s=zohoarc; b=bsha3oVBQA2zmMjy4AHNftgaPP2qZU4MS2XGqCBMTU73T0Cs3XJvCuVncTb3lw/hUmzxcqcjB2N9GTQfPs3h3YjLuEDIMntOwvQUcJ4E5XZQ9Sfbho/b0SSOOYS5nhERak3zgoRh47xvQkpTctIsuSdYxA5HH3Wf9CMm0KmwzM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054570; 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=IIinfGn1345nwe1ovbVgGiByQTDWhPEWmDffdPyBktg=; b=IS8mCugiPnwD6wkXTr6D6gRXiuwVeU1uEO94K1MZTp4VgillPXLPhiiuKvcyKtnnNZ99XmcZnuAGpcrutkbOfxcKKcX/Tf9vMWKJ6U2UQGTHwGCVqEejQ/3DhdkIfzrmPVuOfVfluB5gHfg52VQpMP6usknplw8yGVuAllv2cmk= 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 1616054570917291.3653051197996; Thu, 18 Mar 2021 01:02: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-480-gdfv2ovSPeumjV2m0UtQcw-1; Thu, 18 Mar 2021 04:02:45 -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 2361C8015BD; Thu, 18 Mar 2021 08:02: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 EDF275E1A4; Thu, 18 Mar 2021 08:02: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 ADA141802137; Thu, 18 Mar 2021 08:02:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 12I82cEi029106 for ; Thu, 18 Mar 2021 04:02:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id AA61769322; Thu, 18 Mar 2021 08:02:38 +0000 (UTC) Received: from work.redhat.com (ovpn-112-180.ams2.redhat.com [10.36.112.180]) by smtp.corp.redhat.com (Postfix) with ESMTP id E047166A16; Thu, 18 Mar 2021 08:02:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054567; 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=IIinfGn1345nwe1ovbVgGiByQTDWhPEWmDffdPyBktg=; b=YGf94a26hVvYmK9a0ZvOWAPFzIM1vF7fc5esQPHH6LOJkmeIuPXt5U8oMqpoHbEUBtAHTR CLJ5pg7jZ3zz7bE04TEawc53FdGtARaMCTnwzSYXBJX0EuoSzVc271mrLbusSP3n3OnwPC uQ9/Q58NhIhzVH2UAzS/4igTHiOMq8Q= X-MC-Unique: gdfv2ovSPeumjV2m0UtQcw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 31/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainVcpuParse Date: Thu, 18 Mar 2021 09:01:10 +0100 Message-Id: <20210318080117.70255-32-twiederh@redhat.com> In-Reply-To: <20210318080117.70255-1-twiederh@redhat.com> References: <20210318080117.70255-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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 | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9b4c083801..66d3080744 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -19096,7 +19096,7 @@ virDomainVcpuParse(virDomainDefPtr def, =20 for (i =3D 0; i < n; i++) { virDomainVcpuDefPtr vcpu; - int state; + virTristateBool state =3D VIR_TRISTATE_BOOL_ABSENT; unsigned int id; unsigned int order; =20 @@ -19118,31 +19118,18 @@ virDomainVcpuParse(virDomainDefPtr def, =20 vcpu =3D virDomainDefGetVcpu(def, id); =20 - if (!(tmp =3D virXMLPropString(nodes[i], "enabled"))) { + if (virXMLPropYesNo(nodes[i], "enabled", &state) < 0) + return -1; + if (state =3D=3D VIR_TRISTATE_BOOL_ABSENT) { virReportError(VIR_ERR_XML_ERROR, "%s", _("missing vcpu enabled state")); return -1; } =20 - 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 (virXMLPropYesNo(nodes[i], "hotpluggable", &vcpu->hotplugga= ble) < 0) + return -1; =20 if ((tmp =3D virXMLPropString(nodes[i], "order"))) { if (virStrToLong_uip(tmp, NULL, 10, &order) < 0) { --=20 2.26.2