From nobody Mon Feb 9 13:39:08 2026 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