From nobody Sat Feb 7 07:10:00 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=1619012033; cv=none; d=zohomail.com; s=zohoarc; b=d/BKaGgZo4xEEsw4sL0fg2qJKuY6nv8VzP+xTkW+Cjb2K1ivwOa6nWjEogApJ5e0j2Wss/wLjM5mJSkryaqr33x0f9HZy18BHjp4a2vNoSwBUBjj6TurX6qHgPOIP8RcSdUMHS21LI5klokQyHCMEohVE5CvSDT7AaX2mH4V3O4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619012033; 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=fKe2yawcY5iBbvZ9tmH/6WEj43i6ltBxmFga3zyLTv8=; b=myzwFMnLhPyAWD1j/9MMbfapfGTC8eU7WicY2YnAyWQQWsKH2Qc7IhjEL6j+sgMv66rINCx9q9b7MO6J9CJi83kS5VzS6z7Ifm4y4TE3Ddukkc1bBP0Yy1Uht09jYlPC1LDvr1/cIXtz/+gJZleS6drAfUWzcBWaqFkpBjdlvnA= 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 1619012033917697.496022916207; Wed, 21 Apr 2021 06:33:53 -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-6-HqRmTP83MCuO0WtdLzXw6Q-1; Wed, 21 Apr 2021 09:33:47 -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 CF34C343AD; Wed, 21 Apr 2021 13:33:41 +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 B019C59443; Wed, 21 Apr 2021 13:33:41 +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 71FF41806D1A; Wed, 21 Apr 2021 13:33:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13LDXcq0019760 for ; Wed, 21 Apr 2021 09:33:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id E0D8E3A47; Wed, 21 Apr 2021 13:33:38 +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 357666268F; Wed, 21 Apr 2021 13:33:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619012032; 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=fKe2yawcY5iBbvZ9tmH/6WEj43i6ltBxmFga3zyLTv8=; b=RaKuGu6khD2klPqK7H7QtVv+6u4rQqCjjGFTgNvN05P6VPv+h5n8coUS1EeT+izvfVZm6o RU/TEtvXh1schhcmy4Dv+J2BQze4Tr1pvV0RHgOI3sxNs4c2szaxY41MCUoujKwkWAbviP tP+k281lwCAsOwozfEipf+NHK7uRO6Y= X-MC-Unique: HqRmTP83MCuO0WtdLzXw6Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 02/10] virDomainDeviceBootParseXML: Use virXMLProp* Date: Wed, 21 Apr 2021 15:33:24 +0200 Message-Id: <20210421133332.59662-3-twiederh@redhat.com> In-Reply-To: <20210421133332.59662-1-twiederh@redhat.com> References: <20210421133332.59662-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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/domain_conf.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 5c13d9946c..9113993bce 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -6465,22 +6465,12 @@ static int virDomainDeviceBootParseXML(xmlNodePtr node, virDomainDeviceInfo *info) { - g_autofree char *order =3D NULL; g_autofree char *loadparm =3D NULL; =20 - if (!(order =3D virXMLPropString(node, "order"))) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("missing boot order attribute")); - return -1; - } - - if (virStrToLong_uip(order, NULL, 10, &info->bootIndex) < 0 || - info->bootIndex =3D=3D 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("incorrect boot order '%s', expecting positive in= teger"), - order); + if (virXMLPropUInt(node, "order", 10, + VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO, + &info->bootIndex) < 0) return -1; - } =20 loadparm =3D virXMLPropString(node, "loadparm"); if (loadparm) { --=20 2.26.3