From nobody Mon Feb 9 21:37: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=1616161510; cv=none; d=zohomail.com; s=zohoarc; b=lQ0UhNKWpRR683mz7/MJeHlU+8Q0MbKc3jY0bJTJLUVly8a2wolSZBwGxblMVFKAuWAK7VQl+GDzvTOf9JpMg3TF+q0WisjU+nmmQBP2IuqM1V0G7QoJqO7bl4IE9/TrrXTAmfbp974iNyxy9OwvDs8zhKudYbY036JU/fKUalk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616161510; 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=cRUFcWqdU3iUGCgxg4856Q4Yp7dSP6eKM2f1oXqhSZg=; b=oBw95FwBiQEEeT4HLAx1ozaAkgva3yy9xqdJdaNZ164atRq3ePDJ7z9HyM8VjU+1t0Mfm6CUfB2JQ4HQdTxUGGXul6BntCvNXJQu34HbAoRwlkXIqMAsAe0YI5c3AIxWLGlNP6xgVQbQ4X0Lh8Ktk+TyP2M2hX5r7hgiezdeu/8= 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 1616161510563211.59257458324487; Fri, 19 Mar 2021 06:45:10 -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-199-71nLOeUANjO9sxRb8jW6Wg-1; Fri, 19 Mar 2021 09:43:06 -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 D11F1881283; Fri, 19 Mar 2021 13:42:57 +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 ABC521803D; Fri, 19 Mar 2021 13:42:57 +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 6C65B473A0; Fri, 19 Mar 2021 13:42:57 +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 12JDgm9n020744 for ; Fri, 19 Mar 2021 09:42:48 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7CE0C59442; Fri, 19 Mar 2021 13:42:48 +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 C67F059448; Fri, 19 Mar 2021 13:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1616161505; 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=cRUFcWqdU3iUGCgxg4856Q4Yp7dSP6eKM2f1oXqhSZg=; b=DSE+XOqxLwMHDD+lm44q/ClvxEfl+GOQdKB/pmVwjH0/AZpYYcaQo2BgRa+UPQjzbnd/nh 509ek9WAwJk8Ir0cvi/oFeROTEj1aweDQZ3gZP6YhSzhF2vb8gx/5Rld2lCldk1XjkyUIy SoicwdcoRG70iZrIvfRVK2tlHRr+r6I= X-MC-Unique: 71nLOeUANjO9sxRb8jW6Wg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 45/51] backup_conf: Use virXMLPropTristateXXX in virDomainBackupDiskDefParseXML Date: Fri, 19 Mar 2021 14:40:59 +0100 Message-Id: <20210319134105.442774-46-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.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/backup_conf.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index ba58b2e322..ce85ed8bad 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -106,7 +106,6 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, g_autofree char *type =3D NULL; g_autofree char *format =3D NULL; g_autofree char *idx =3D NULL; - g_autofree char *backup =3D NULL; g_autofree char *state =3D NULL; g_autofree char *backupmode =3D NULL; int tmp; @@ -125,17 +124,10 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, return -1; } =20 - def->backup =3D VIR_TRISTATE_BOOL_YES; - - if ((backup =3D virXMLPropString(node, "backup"))) { - if ((tmp =3D virTristateBoolTypeFromString(backup)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid disk 'backup' state '%s'"), backup); - return -1; - } - - def->backup =3D tmp; - } + if (virXMLPropTristateBool(node, "backup", false, &def->backup) < 0) + return -1; + if (def->backup =3D=3D VIR_TRISTATE_BOOL_ABSENT) + def->backup =3D VIR_TRISTATE_BOOL_YES; =20 /* don't parse anything else if backup is disabled */ if (def->backup =3D=3D VIR_TRISTATE_BOOL_NO) --=20 2.26.2