From nobody Mon Feb 9 23:00:57 2026 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=1616054704; cv=none; d=zohomail.com; s=zohoarc; b=A2eK3+kafPppsZaiHw1SU6tegoyX4yu7Sziz9k8k6hZ62NLlJJA1IAtGdw7+XVlby12yV8NlU1j5rlXZCVZd02aS0VkUwxZqaZdE6TatpknKu6FAxSLaEvP5AvsNiRJI03yajRvvlRaewmFsF/2FziD6mgR1r2cXzeB6G78y/4U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616054704; 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=O/GVynGPRduzS5h0mWHDrmq39spWx2mGsyDZyRlzRgI=; b=a/PqM8Rv6k/nBrILZ0bN912G7J6XVUOpheOunAtXskGvks2YU10zJBkaY2AUiBbRWahC/zzNwHDmFfEfSkH0gKO73WeJ9+CEh1tWpqwF/j4fG9z6KERg/lwiOeyQsUeaX6kq12SZ2RfydlxR03Y+Lsxx9OeaRE3A7qM5HuQKCLg= 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 1616054704231237.89232027265177; Thu, 18 Mar 2021 01:05: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-31-_RNBoE_HNTikFjUSiQe39g-1; Thu, 18 Mar 2021 04:02:17 -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 D6912839A58; Thu, 18 Mar 2021 08:02:09 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B375F610F0; Thu, 18 Mar 2021 08:02: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 72836180213D; Thu, 18 Mar 2021 08:02:09 +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 12I81woj028486 for ; Thu, 18 Mar 2021 04:01:58 -0400 Received: by smtp.corp.redhat.com (Postfix) id D52E76362B; Thu, 18 Mar 2021 08:01:58 +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 1E427669F2; Thu, 18 Mar 2021 08:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616054703; 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=O/GVynGPRduzS5h0mWHDrmq39spWx2mGsyDZyRlzRgI=; b=KhWaiBEtwVX3Fzj0ZY6EGIRzNJKQ6dv19Jrf7NFwNz0sJWqMnt25qengWlIZhm5hmo59Y4 mRYQwA9qu5G5V1pMigvPrAfr8D84KmQKNZTDNJqaqhQKJCNPstZtuqF8k9YPQ6p+zfLO+M cdey5ykyZkOvh2F3PmGlaCyVRWI/07I= X-MC-Unique: _RNBoE_HNTikFjUSiQe39g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 23/38] domain_conf: Use virXMLProp(OnOff|YesNo) in virDomainMemballoonDefParseXML Date: Thu, 18 Mar 2021 09:01:02 +0100 Message-Id: <20210318080117.70255-24-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.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 | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index fe35a3960e..0c4f7ab879 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14264,8 +14264,8 @@ 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; + virTristateSwitch autodeflate =3D VIR_TRISTATE_SWITCH_ABSENT; + virTristateSwitch free_page_reporting =3D VIR_TRISTATE_SWITCH_ABSENT; =20 def =3D g_new0(virDomainMemballoonDef, 1); =20 @@ -14282,19 +14282,13 @@ 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 (virXMLPropOnOff(node, "autodeflate", &autodeflate) < 0) goto error; - } + def->autodeflate =3D autodeflate; =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 (virXMLPropOnOff(node, "freePageReporting", &free_page_reporting) <= 0) goto error; - } + def->free_page_reporting =3D free_page_reporting; =20 ctxt->node =3D node; if (virXPathUInt("string(./stats/@period)", ctxt, &period) < -1) { --=20 2.26.2