From nobody Mon Feb 9 23:42:47 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=1619007010; cv=none; d=zohomail.com; s=zohoarc; b=AHJ3nRj5r4odg0WsPoJJAHII1b+UmT8A0t/uQuNj50KCFX6AESPf+v8XXpSDHsKOeEd1ivo4ESq6UecTT9UmtSMVXZZQSqtOKqKn8GOrJZJsJUNvWZ2ryJO8DTkL3007103sHeuyFwRATusvs+wiZWjXtSGwL3z0bEBi5jW489s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619007010; 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=YHtIRLRmIbjd2hU47ilbIC2nstLRM3GYqu+PmbTN0l4=; b=axH4Pjm4qAoA5c0A1t2lUlOZw2GKXnFc6sId7EQioZFRu61V5wW7ecafyL3IwSQU5WanoAVRzY9kByNBFDHCoRxBpw9Bc6I+Hb331ex4GOmaIFkocTFC4bDwdM5Yeb54sEu6D7SM9IlzkJfqZQFp4DuZM08Zx45Q0Ov7oO+7Omg= 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 1619007010805543.0897090991508; Wed, 21 Apr 2021 05:10: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-194-meyjBwT0MOG4rRyszuULMA-1; Wed, 21 Apr 2021 08:09:02 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 715689F93A; Wed, 21 Apr 2021 12:08:56 +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 E47985D9C0; Wed, 21 Apr 2021 12:08:55 +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 11EC41806D38; Wed, 21 Apr 2021 12:08:55 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13LC8EnN008625 for ; Wed, 21 Apr 2021 08:08:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id DE95C60938; Wed, 21 Apr 2021 12:08:14 +0000 (UTC) Received: from work.redhat.com (ovpn-112-172.ams2.redhat.com [10.36.112.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08BF460871; Wed, 21 Apr 2021 12:08:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619007009; 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=YHtIRLRmIbjd2hU47ilbIC2nstLRM3GYqu+PmbTN0l4=; b=JEBaOddl00ZgavYfC5yq5+46ShMcHJhmpKpXOhFNm0Ugneqc5Dd1AlNo3vbiFmxVAR/3BR tAUhV3InglmOGWPQxHVNzwxZp9CXED1GroVBDOKu7hfwP8ajdCaXk7RiKELZECxcwPq5MM lnXHst/lo4wFO77LlJhi9wnJ5n4vnNQ= X-MC-Unique: meyjBwT0MOG4rRyszuULMA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH v2 01/10] virDomainBackupDiskDefParseXML: Use virXMLProp* Date: Wed, 21 Apr 2021 14:07:59 +0200 Message-Id: <20210421120808.35786-2-twiederh@redhat.com> In-Reply-To: <20210421120808.35786-1-twiederh@redhat.com> References: <20210421120808.35786-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: Peter Krempa , 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.14 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 Reviewed-by: Peter Krempa --- src/conf/backup_conf.c | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index 7f54a25ff6..e4464b91a0 100644 --- a/src/conf/backup_conf.c +++ b/src/conf/backup_conf.c @@ -106,10 +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; xmlNodePtr srcNode; unsigned int storageSourceParseFlags =3D 0; bool internal =3D flags & VIR_DOMAIN_BACKUP_PARSE_INTERNAL; @@ -127,15 +123,9 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, =20 def->backup =3D VIR_TRISTATE_BOOL_YES; =20 - 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", VIR_XML_PROP_NONE, + &def->backup) < 0) + return -1; =20 /* don't parse anything else if backup is disabled */ if (def->backup =3D=3D VIR_TRISTATE_BOOL_NO) @@ -146,28 +136,18 @@ virDomainBackupDiskDefParseXML(xmlNodePtr node, def->exportbitmap =3D virXMLPropString(node, "exportbitmap"); } =20 - if ((backupmode =3D virXMLPropString(node, "backupmode"))) { - if ((tmp =3D virDomainBackupDiskBackupModeTypeFromString(backupmod= e)) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("invalid backupmode '%s' of disk '%s'"), - backupmode, def->name); - return -1; - } - - def->backupmode =3D tmp; - } + if (virXMLPropEnum(node, "backupmode", + virDomainBackupDiskBackupModeTypeFromString, + VIR_XML_PROP_NONE, &def->backupmode) < 0) + return -1; =20 def->incremental =3D virXMLPropString(node, "incremental"); =20 if (internal) { - if (!(state =3D virXMLPropString(node, "state")) || - (tmp =3D virDomainBackupDiskStateTypeFromString(state)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("disk '%s' backup state wrong or missing'"), = def->name); + if (virXMLPropEnum(node, "state", + virDomainBackupDiskStateTypeFromString, + VIR_XML_PROP_REQUIRED, &def->state) < 0) return -1; - } - - def->state =3D tmp; } =20 type =3D virXMLPropString(node, "type"); --=20 2.26.3