From nobody Tue Feb 10 07:38:55 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=1616169505; cv=none; d=zohomail.com; s=zohoarc; b=EFwYstlfGmzfSxfXxopW1Hyt5MNsmQrABnpDHjIxsKN/Th0pBOsYaK5zvWyo2QHirdzkwpAkt3tIYW554QOlt1yJ2IsA/KxR9FnLvXnQeQCINrG8mDQLSNJe7SPZsWyFJQFjy3iimYG038LcJRGHw6/IS1odN2xAtvchjuYPs/w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616169505; 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=RCHZif9eyHavLvUu3wz0pREdC56t5aH3qdLndxMG/Nw=; b=WrUJ7OQYCWuFHXLI6HbMWOc0BKpZnRylynudD2VmTqJ33LwD6O8UooJA2ju1O79tDYZvxmGYLc+oxXioS/DLy719vJgusCE6tGxCTRo4iD9unlmTMbpbXu00d7X2UrhQ3ujrwnWaZ96NUHSmpZvIfs7lOzTwifMbX1MCKHED04s= 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 1616169505980985.0354077987156; Fri, 19 Mar 2021 08:58:25 -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-387-CAvE6mv9P9aqoUPxDr8Tpw-1; Fri, 19 Mar 2021 11:58:22 -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 301429CC12; Fri, 19 Mar 2021 15:58:14 +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 D9BE75D740; Fri, 19 Mar 2021 15:58:13 +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 921731800848; Fri, 19 Mar 2021 15:58:13 +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 12JFw3Ab006291 for ; Fri, 19 Mar 2021 11:58:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3DEA41C95E; Fri, 19 Mar 2021 15:58:03 +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 782681A353; Fri, 19 Mar 2021 15:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616169505; 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=RCHZif9eyHavLvUu3wz0pREdC56t5aH3qdLndxMG/Nw=; b=SB0M0MbYl+aAIkKwGLnmJDcEw3W+sXah43uGovZvGfHeuubCgNif3szaCcoDrdf7AzUSYB ajKMS/YH4x6o5jgl18R8DjoofmJwQYwhMr9+Y69JsrZZABwxUYDRD7KLCYuWaVGFtmFgU2 pBVyegRQkbOYFswsV9bd/U3e0DRewWw= X-MC-Unique: CAvE6mv9P9aqoUPxDr8Tpw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v3 09/51] conf: Use virTristateXXX in virDomainMemballoonDef Date: Fri, 19 Mar 2021 16:57:06 +0100 Message-Id: <20210319155748.680146-10-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.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 | 26 ++++++++++++++++---------- src/conf/domain_conf.h | 4 ++-- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e99699028a..0480fc610d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14547,18 +14547,24 @@ 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); - goto error; + if ((deflate =3D virXMLPropString(node, "autodeflate"))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(deflate)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid autodeflate attribute value '%s'"), = deflate); + goto error; + } + def->autodeflate =3D value; } =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); - goto error; + if ((freepage_reporting =3D virXMLPropString(node, "freePageReporting"= ))) { + int value; + if ((value =3D virTristateSwitchTypeFromString(freepage_reporting)= ) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("invalid freePageReporting attribute value '%= s'"), freepage_reporting); + goto error; + } + def->free_page_reporting =3D value; } =20 ctxt->node =3D node; 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