From nobody Tue Feb 10 12:39:21 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=1618575783; cv=none; d=zohomail.com; s=zohoarc; b=Zwo2x95Ki1ALTt3j0fD8xdqNQnvwkGw0Gc5VeoSqjWOBocH9lbADNuNEZCnkXvHr2Epzb4sAGjMaHFZiZSWQyhlIHWLiJwZ5VYrnMqrGd/fak+kjWMCNeUwS6OE2cbdKVZEzpn4UsXzGIuKP+yQgUcdnfHLPkSINainzY+VOuBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618575783; 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=72HxAq8hWw4cP09JdRrpqAKM6FryJgIm/UYN4sE7Ppg=; b=J8PMATQd3lFbsBSKw2QR2xPbWeSEWzjcNaduCotYU9hkWrQTLuR0C+/cNQH0lQ370bOenqjoIhaaB0DSfo69YRwsGaTjylk7nAH9gvHl4LL4pGOYjZjRSqm/XJ5mUaQ8HDCrqzZWK6jPSkfaUMXfN7yVpNGsdw4fqlUHDrLyxpA= 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 161857578341288.15585471880718; Fri, 16 Apr 2021 05:23:03 -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-442-_KiyuPMHPp6zSm6t5BWZXA-1; Fri, 16 Apr 2021 08:22:15 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92FBD107ACF5; Fri, 16 Apr 2021 12:22:07 +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 6869E19715; Fri, 16 Apr 2021 12:22:07 +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 376E51806D1C; Fri, 16 Apr 2021 12:22:07 +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 13GCLIN8020672 for ; Fri, 16 Apr 2021 08:21:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id D0BB917C08; Fri, 16 Apr 2021 12:21:18 +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 23F905D9C0; Fri, 16 Apr 2021 12:21:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618575782; 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=72HxAq8hWw4cP09JdRrpqAKM6FryJgIm/UYN4sE7Ppg=; b=AO6X5gAGqE5DPZtyJqGmKCnbMflDxKuCgK8ZRQX2MzhO0XcUfPj9bqpDknYQc4p4WPizTO xUvwUA3pvY6sOhef1FpMQxb+yF4F/DwfmgtJzWonnBvjDKol83yhRRbYqWaJe28NTMUlyg r59y9zRpdDhfyilkCMuDIRnu1RH/e0Y= X-MC-Unique: _KiyuPMHPp6zSm6t5BWZXA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/10] virDomainDeviceUSBAddressParseXML: Use virXMLProp* Date: Fri, 16 Apr 2021 14:20:59 +0200 Message-Id: <20210416122100.360154-10-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.84 on 10.5.11.23 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 | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/conf/device_conf.c b/src/conf/device_conf.c index f7bf2de6f1..1ce31e9234 100644 --- a/src/conf/device_conf.c +++ b/src/conf/device_conf.c @@ -403,19 +403,16 @@ virDomainDeviceUSBAddressParseXML(xmlNodePtr node, virDomainDeviceUSBAddress *addr) { g_autofree char *port =3D virXMLPropString(node, "port"); - g_autofree char *bus =3D virXMLPropString(node, "bus"); =20 memset(addr, 0, sizeof(*addr)); =20 if (port && virDomainDeviceUSBAddressParsePort(addr, port) < 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; - } + return 0; } =20 --=20 2.26.2