From nobody Mon Feb 9 21:38:22 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=1618575715; cv=none; d=zohomail.com; s=zohoarc; b=N+TaMpgocup7jxsZa4UC0Ox+ugTOS6oGtXO4QWaQO5Ov/ldDaogqVjOG/HeUyvqjayXWYZf4xgF7WJT3Q0HKg6Kj3bpEi4aImmEZi38RJV8A9bIJePBA3jtyG8z+m1Titx0YqHFHYX7H0tLz5u21rPv1JzggX2OXnLCvtzbj7EE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618575715; 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=NdLUKMWKmEd4dNp3EOIodlJbWtuz8aQZj70wLk0s7aU=; b=jLy/0pecJKNE1QtZPaftn5EI9vqJ+bAmONyvQX9lh7UBytv9EPkASQcr9R6ljrxQiA0S3+qILRWBmSuEkT6SYvx9YosdlyzHiL1KVFquMa3Efk1euFHRmWHyCvgGUrjvPgGzysW9aQtVM7dxcnxQUguuj8BjAnIYoNxynF/XXts= 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 1618575715210419.20680916992865; Fri, 16 Apr 2021 05:21:55 -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-97-d_0dxTK_Md-5O0G6MGwaOA-1; Fri, 16 Apr 2021 08:21:51 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B3E87802B7F; Fri, 16 Apr 2021 12:21:45 +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 7CC5D646DC; Fri, 16 Apr 2021 12:21:45 +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 834F644A5E; Fri, 16 Apr 2021 12:21:44 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13GCL71c020577 for ; Fri, 16 Apr 2021 08:21:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 012D717C08; Fri, 16 Apr 2021 12:21:07 +0000 (UTC) Received: from work.redhat.com (ovpn-113-12.ams2.redhat.com [10.36.113.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D59B5D9E3; Fri, 16 Apr 2021 12:21:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618575714; 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=NdLUKMWKmEd4dNp3EOIodlJbWtuz8aQZj70wLk0s7aU=; b=GkX5SyVQQVv99UIgFwZy0z7mABtvkWE1UXR1HusCgtTk+8hbpZoUPH/HvCTje/6wSyV+ML 3Ip0aKmBLj//toIrQ4ruPcSeEoQR6yWL5SFgn0PBLnSgi6iPGJpSySSZtVqphu6muMyfvb iZaMNX9QntHTh82hOcBnjIOiWpieR5g= X-MC-Unique: d_0dxTK_Md-5O0G6MGwaOA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/10] virDomainBackupDiskDefParseXML: Use virXMLProp* Date: Fri, 16 Apr 2021 14:20:51 +0200 Message-Id: <20210416122100.360154-2-twiederh@redhat.com> In-Reply-To: <20210416122100.360154-1-twiederh@redhat.com> References: <20210416122100.360154-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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.13 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 | 40 ++++++++++------------------------------ 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/src/conf/backup_conf.c b/src/conf/backup_conf.c index 2de77a59c0..859609946f 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_OPTIONAL, + &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_OPTIONAL, &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.2