From nobody Mon Feb 9 20:59:14 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=1618575727; cv=none; d=zohomail.com; s=zohoarc; b=bzn5wIWZKwhUJN5P3oJ01tu6jYphde/CpJnoamVbNXdR9acUh21LYvZs27ZSMQR7LU/AA2R8+d0ITDwpPtx5AIo6df/KSmaBVaRh00a9aVuxDwiXFGAPTu7nTzKsn7q5qHUGM2W/gySzprwXP4NcrAA4TFK6biX56D5OT0dfcOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618575727; 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=LepJ+wazxH/HqYLywlys5c6X1YN+cIyCbOkiR8x6lbM=; b=L0gfISNqWPoibjsti2f2Dv8lm5IPSxi2jQlrYdkazaqlFTTvUwPdBu57GgrmSboDWb0P7FbnRnphk0AzuZiKZf2UToBiFdmaRyHyE7bnPKcAmHxFmB2ptQRLsMsuO+Z3P3MFU9bfBCTpc5pVHQJyuuNHdqZan2AKP893rdbg16Y= 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 161857572702223.832342143208734; Fri, 16 Apr 2021 05:22:07 -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-232-7kDgNikzMLm2c_uinfMlfw-1; Fri, 16 Apr 2021 08:22:03 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8AFE48189CA; Fri, 16 Apr 2021 12:21:58 +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 6BDCB69321; Fri, 16 Apr 2021 12:21:58 +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 3564A1806D17; Fri, 16 Apr 2021 12:21:58 +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 13GCLFDb020643 for ; Fri, 16 Apr 2021 08:21:15 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEA295D9E3; Fri, 16 Apr 2021 12:21:15 +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 030EB5D9C0; Fri, 16 Apr 2021 12:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618575726; 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=LepJ+wazxH/HqYLywlys5c6X1YN+cIyCbOkiR8x6lbM=; b=M8OtdVKeY1VL3yKEK5cxKRvSUxEPkat2JI7qvfeCwP1Ch0XCpPgKY9fc5/MmdmggrixhYA Nb6jjfQ54cbqkDaQlelcBA7i0GfTKcFfDVjF2rQ/TuFt3ba1ETm6R/AyE4jPVfQgwnJ4Am I/Fl1lxBEiSvueXBlstWEhUIQK11HeQ= X-MC-Unique: 7kDgNikzMLm2c_uinfMlfw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/10] virDomainDeviceDriveAddressParseXML: Use virXMLProp* Date: Fri, 16 Apr 2021 14:20:56 +0200 Message-Id: <20210416122100.360154-7-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.15 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/device_conf.c | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index 621ff1b476..5a98cd8c0f 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -316,40 +316,23 @@ int virDomainDeviceDriveAddressParseXML(xmlNodePtr node, virDomainDeviceDriveAddress *addr) { - g_autofree char *controller =3D virXMLPropString(node, "controller"); - g_autofree char *bus =3D virXMLPropString(node, "bus"); - g_autofree char *target =3D virXMLPropString(node, "target"); - g_autofree char *unit =3D virXMLPropString(node, "unit"); - memset(addr, 0, sizeof(*addr)); =20 - if (controller && - virStrToLong_uip(controller, NULL, 10, &addr->controller) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'controller' attribute")); + if (virXMLPropUInt(node, "controller", 10, VIR_XML_PROP_OPTIONAL, + &addr->controller) < 0) return -1; - } =20 - if (bus && - virStrToLong_uip(bus, NULL, 10, &addr->bus) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'bus' attribute")); + if (virXMLPropUInt(node, "bus", 10, VIR_XML_PROP_OPTIONAL, + &addr->bus) < 0) return -1; - } =20 - if (target && - virStrToLong_uip(target, NULL, 10, &addr->target) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'target' attribute")); + if (virXMLPropUInt(node, "target", 10, VIR_XML_PROP_OPTIONAL, + &addr->target) < 0) return -1; - } =20 - if (unit && - virStrToLong_uip(unit, NULL, 10, &addr->unit) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Cannot parse
'unit' attribute")); + if (virXMLPropUInt(node, "unit", 10, VIR_XML_PROP_OPTIONAL, + &addr->unit) < 0) return -1; - } =20 return 0; } --=20 2.26.2