From nobody Sat Feb 7 07:10:32 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=1619012039; cv=none; d=zohomail.com; s=zohoarc; b=N0mK6RUe00/fsD6J/c1NJHKLzxC8dttM4A1k1jqh9zPpjc4RNI2Od8qORe7AP0JwX0bLSnGNdlBQBYJEF4wFZy5AQrAnrtUIKg61bUZ9VoQALBzEzL2WSqt9wCF5gUoB7GJ3vi0nBud3ZceIGl8VRUM5qx3QDbp4qre6f+cdm50= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619012039; 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=YUfTqCxVM1cIVxPiSpfymNXIaMtCJ+FW3tuAls1OoHs=; b=NyRftcECXtI7RTqVRZcqOk7HYrCnbrbfPjubqpuqlWZNoxk2c58nOSkQNTMIgUw4R6z2jO7DtoDPlKg9431Vsj/ZOcHUIzbiAozyAaFb2MVnQglPgXCtlv9qAa6sH1mPUiN8E80Dsfb+5kzMvEW3rUOHcAStQop7DB2CrILVCBs= 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 1619012039922551.3231909162529; Wed, 21 Apr 2021 06:33:59 -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-IZ9lJJq6Pn24r-VrItMSiA-1; Wed, 21 Apr 2021 09:33:56 -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 A33E7343A9; Wed, 21 Apr 2021 13:33:46 +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 837226085A; Wed, 21 Apr 2021 13:33:46 +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 4BA5944A5E; Wed, 21 Apr 2021 13:33:46 +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 13LDXbIJ019753 for ; Wed, 21 Apr 2021 09:33:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id D95605D747; Wed, 21 Apr 2021 13:33:37 +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 2DAD4627DC; Wed, 21 Apr 2021 13:33:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619012038; 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=YUfTqCxVM1cIVxPiSpfymNXIaMtCJ+FW3tuAls1OoHs=; b=XtaBMLEgBcEivSFn4KRXgWZEdQAas0DSKxX559ykyU83otUSC8Cz3fNnvJi7GqgdJC1Sku +Ojp+1VTNNYjXOGkc2zFsbkLLikPm3SYGknROW0YdJf83vwLlqGE8ZpYv7f3rLYBC1USSD jCRgKPIUaXz/FO5P/yhYVogG6PZTtVE= X-MC-Unique: IZ9lJJq6Pn24r-VrItMSiA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/10] virDomainVirtioOptionsParseXML: Use virXMLProp* Date: Wed, 21 Apr 2021 15:33:23 +0200 Message-Id: <20210421133332.59662-2-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.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/domain_conf.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9a0d1f9285..5c13d9946c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1602,45 +1602,22 @@ static int virDomainVirtioOptionsParseXML(xmlNodePtr driver, virDomainVirtioOptions **virtio) { - int val; - virDomainVirtioOptions *res; - g_autofree char *str =3D NULL; - if (*virtio || !driver) return 0; =20 *virtio =3D g_new0(virDomainVirtioOptions, 1); =20 - res =3D *virtio; - - if ((str =3D virXMLPropString(driver, "iommu"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid iommu value")); - return -1; - } - res->iommu =3D val; - } - VIR_FREE(str); + if (virXMLPropTristateSwitch(driver, "iommu", VIR_XML_PROP_NONE, + &(*virtio)->iommu) < 0) + return -1; =20 - if ((str =3D virXMLPropString(driver, "ats"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid ats value")); - return -1; - } - res->ats =3D val; - } - VIR_FREE(str); + if (virXMLPropTristateSwitch(driver, "ats", VIR_XML_PROP_NONE, + &(*virtio)->ats) < 0) + return -1; =20 - if ((str =3D virXMLPropString(driver, "packed"))) { - if ((val =3D virTristateSwitchTypeFromString(str)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("invalid packed value")); - return -1; - } - res->packed =3D val; - } + if (virXMLPropTristateSwitch(driver, "packed", VIR_XML_PROP_NONE, + &(*virtio)->packed) < 0) + return -1; =20 return 0; } --=20 2.26.3