From nobody Mon Feb 9 06:49:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1663577737; cv=none; d=zohomail.com; s=zohoarc; b=eQEa6ODK1z3p/8O5lLv5e7cPWsEiVmHtp13H/S4D3VJxIqxFayFjtK0yDIb2qQp/UX58O/4XlytbXUSM+xh9I+VxHZMLMj+ztzgVacZGztNI2c44QLjyBJWl96NYH2qeRoMiXHYeG3EBig1FehgT6qIK4tiPjSh+f+WyMddJ6Hw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663577737; h=Content-Type:Content-Transfer-Encoding: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=jYH3TFr9g/Ecs6fSDV+HyaTHbU+6OfoEQNIxNnta4RA=; b=YF3oZ4JEzZcyKkChmgCmX5cbYt66CeMGFN2LadM94k6Ff7ErnWfbqSeCblZkHaq+kYVEmHiZr3CVGfx9M/GR5XkmqfOVahXeuw9PsY8DOcUno4bpHhiyO6Qr1U533uvcf7G0beg3ow2KB0MYmOvWgV04HOnjb7hnzCK8T4NltFY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1663577736993757.2370994599827; Mon, 19 Sep 2022 01:55:36 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-127-IL-pEIz1Pcig5cpg-P7Btg-1; Mon, 19 Sep 2022 04:55:33 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C2BF3817A61; Mon, 19 Sep 2022 08:55:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 196342166B26; Mon, 19 Sep 2022 08:55:31 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E92941946594; Mon, 19 Sep 2022 08:55:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 72A2C1946586 for ; Mon, 19 Sep 2022 08:55:30 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 555BF40C6EC4; Mon, 19 Sep 2022 08:55:30 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id AE41240C6EC2 for ; Mon, 19 Sep 2022 08:55:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663577736; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=jYH3TFr9g/Ecs6fSDV+HyaTHbU+6OfoEQNIxNnta4RA=; b=Kpi+oN0YQCbqO24CdnJWDgv0tsMrzs3Toutuym3oNsaNI91ryqY3067Bpd3jRtVNOIIxJg Zph3eTfS6r9EOyS451OzCpzKJYmxDZLM9y/JtExo1XLy7pyZvyUxIRnXx6FxdFLN2+e5qq 8+FdQ/UnfRCKFPjrlfdXne4Ivec37Ig= X-MC-Unique: IL-pEIz1Pcig5cpg-P7Btg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 07/37] virDomainNetDefParseXML: Use virXMLPropEnumDefault for parsing 'def->type' Date: Mon, 19 Sep 2022 10:54:52 +0200 Message-Id: <77948cb9246425b523d72c60b1747c407c05e20a.1663577577.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1663577739036100011 Content-Type: text/plain; charset="utf-8" Replace ad-hoc logic that fills the default by use of the proper helper function. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 621b1df6c8..745a7e428c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9002,13 +9002,10 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, ctxt->node =3D node; - if ((rv =3D virXMLPropEnum(node, "type", virDomainNetTypeFromString, - VIR_XML_PROP_NONE, &def->type)) < 0) + if (virXMLPropEnumDefault(node, "type", virDomainNetTypeFromString, + VIR_XML_PROP_NONE, &def->type, VIR_DOMAIN_NE= T_TYPE_USER) < 0) return NULL; - if (rv =3D=3D 0) - def->type =3D VIR_DOMAIN_NET_TYPE_USER; - if (virXMLPropTristateBool(node, "trustGuestRxFilters", VIR_XML_PROP_N= ONE, &def->trustGuestRxFilters) < 0) return NULL; --=20 2.37.1