From nobody Mon Feb 9 15:45:34 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=1619020357; cv=none; d=zohomail.com; s=zohoarc; b=SNHtppx7r3yLGulk3M1S1oXZbuCN7ejmFarkockVJBPhQ+JrqM1PRAAP9KclibRaNYAjSCaX+artsR+DmQS0DaMv2emosh+s7ByLIwGVdQggdD6lMeWSLIARhWXBpMPmJ/L+ypgXxqh4o78Ju4tmQbHNt3JEAYKexyBIseplE24= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619020357; 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=zMwnjmoNGHab4W1xhAK5i8G305PFWoP/+2RKB82HRCg=; b=dZZSJH+xDJEJ3f1g5KJ33eWGPhN55sKD/Q8fVW76dkEVp2lVnq9BJ3GdaJKdP0M7US8bKfwkLROx1hgY6wPZnIzrqQYBbNfo8gFRrrQ4tQ7DVSlxkCl6FqyXQA3wdjfU8YiiTnspfYjInIU0jdoN35/1g/ZgkwMEHuVRCc1Q6TI= 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 1619020357140206.63269422543044; Wed, 21 Apr 2021 08:52:37 -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-532-NjQmjBWNMam_GJY-4n3exA-1; Wed, 21 Apr 2021 11:51:58 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 878EF107ACF9; Wed, 21 Apr 2021 15:51:53 +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 6A1E859448; Wed, 21 Apr 2021 15:51:53 +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 34A3B180B651; Wed, 21 Apr 2021 15:51:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13LFpkNM006921 for ; Wed, 21 Apr 2021 11:51:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id DEF521017CF5; Wed, 21 Apr 2021 15:51:46 +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 3196610016DB; Wed, 21 Apr 2021 15:51:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619020356; 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=zMwnjmoNGHab4W1xhAK5i8G305PFWoP/+2RKB82HRCg=; b=iggzLV+dTHykcHORsSAvENuIeY2lov5M2rzZUyTMcoRaYBMuQLjOZ9b/yKL0GRl7p6Vgar h6MeYoCaRx9TL1MmnLrcCQTZ53modXbtMBySGz2DnRh3rSrF+zd4FGrGD1xoYwz3iJoDLk xXc6W80pOpl1qiJktjEHs1T9BKjk+Mo= X-MC-Unique: NjQmjBWNMam_GJY-4n3exA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] virStorageEncryptionInfoParseCipher: Use virXMLProp* Date: Wed, 21 Apr 2021 17:51:30 +0200 Message-Id: <20210421155133.162030-8-twiederh@redhat.com> In-Reply-To: <20210421155133.162030-1-twiederh@redhat.com> References: <20210421155133.162030-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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.11 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/storage_encryption_conf.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encrypti= on_conf.c index c2c7c1dd43..9112b96cc7 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -176,27 +176,15 @@ static int virStorageEncryptionInfoParseCipher(xmlNodePtr info_node, virStorageEncryptionInfoDef *info) { - g_autofree char *size_str =3D NULL; - if (!(info->cipher_name =3D virXMLPropString(info_node, "name"))) { virReportError(VIR_ERR_XML_ERROR, "%s", _("cipher info missing 'name' attribute")); return -1; } =20 - if ((size_str =3D virXMLPropString(info_node, "size")) && - virStrToLong_uip(size_str, NULL, 10, &info->cipher_size) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("cannot parse cipher size: '%s'"), - size_str); - return -1; - } - - if (!size_str) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("cipher info missing 'size' attribute")); + if (virXMLPropUInt(info_node, "size", 10, VIR_XML_PROP_REQUIRED, + &info->cipher_size) < 0) return -1; - } =20 info->cipher_mode =3D virXMLPropString(info_node, "mode"); info->cipher_hash =3D virXMLPropString(info_node, "hash"); --=20 2.26.3