From nobody Mon Feb 9 10:57:23 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=1663577763; cv=none; d=zohomail.com; s=zohoarc; b=k/BM0qZJqw+7YrCcTJz9dTeRdudcnK1PbQU+MlpEgKy0lUq2zconzwk+3ZqsmLU3ubmxfc7TE2SrFWYNEx4GjLSEvysohgLoe7agjqInqbMh0efY/AmflrxtELSX66Un21QYv97XUjEiY4fjc6pOqTsA2J3UyLlzrVXOGmYV9sY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663577763; 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=P6nDkuFBKo525epoOxBjErGmLJ/7FWFWix0aANIWypY=; b=MMP8q2p8ORgQOAlzg6bZ3W1p6M4OR1QlI7L+ul35YVprzo/C8J5rBup5yK9GElb3CeAL+R8zM26VRD4yuICorSlstV7HaEjt7a0Xlj0QvUzPuvcbMR7G0DLnlh+Chzj1+9aKIeAmj1fDc5+gg+zMAKGlB6CfDi5oG1+THbtt+o8= 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 1663577763819458.1999191218182; Mon, 19 Sep 2022 01:56:03 -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-k06qSqdQNQ6ucsK94_hy8A-1; Mon, 19 Sep 2022 04:55:33 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2C00F3C0257E; 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 18EFA49BB60; 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 F042219465A2; 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 677451946586 for ; Mon, 19 Sep 2022 08:55:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 59EB140C6EC2; Mon, 19 Sep 2022 08:55:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id CDAB940C6EC4 for ; Mon, 19 Sep 2022 08:55:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663577762; 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=P6nDkuFBKo525epoOxBjErGmLJ/7FWFWix0aANIWypY=; b=drxwQBRUoCkX/Tv45YCqLLMT6MA7cSe+78yr7iAGPR/h+7IPhLzAb7WnjbAGUAlKdabzkX ce4HCrUJnD04pcFAxjVvSaLAgf6wDV35tKeN5XVDsuWAdNOC8wBa7toPUIW68cw2FoJ+hn sgYYBMiZcVtD+iw/rOwoDmG7btztSYY= X-MC-Unique: k06qSqdQNQ6ucsK94_hy8A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 06/37] virDomainNetDefParseXML: Split out parsing of 'driver' subelement Date: Mon, 19 Sep 2022 10:54:51 +0200 Message-Id: <0a21cf4a1c1d84e1c798a21fd9a9d189adf860e7.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.9 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: 1663577765482100002 Content-Type: text/plain; charset="utf-8" Separate the code into virDomainNetDefParseXMLDriver. Some local variables were renamed and the scope decreased. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 238 ++++++++++++++++++++++------------------- 1 file changed, 126 insertions(+), 112 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0e25d585c8..621b1df6c8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8827,6 +8827,130 @@ virDomainNetTeamingInfoParseXML(xmlXPathContextPtr = ctxt, } +static int +virDomainNetDefParseXMLDriver(virDomainNetDef *def, + xmlXPathContextPtr ctxt) +{ + xmlNodePtr driver_node; + + if ((driver_node =3D virXPathNode("./driver", ctxt)) && + (virDomainVirtioOptionsParseXML(driver_node, &def->virtio) < 0)) + return -1; + + if (def->type !=3D VIR_DOMAIN_NET_TYPE_HOSTDEV && + virDomainNetIsVirtioModel(def)) { + xmlNodePtr hostNode; + xmlNodePtr guestNode; + + if (virXMLPropEnum(driver_node, "name", + virDomainNetBackendTypeFromString, + VIR_XML_PROP_NONZERO, + &def->driver.virtio.name) < 0) + return -1; + + if (virXMLPropEnum(driver_node, "txmode", + virDomainNetVirtioTxModeTypeFromString, + VIR_XML_PROP_NONZERO, + &def->driver.virtio.txmode) < 0) + return -1; + + if (virXMLPropTristateSwitch(driver_node, "ioeventfd", + VIR_XML_PROP_NONE, + &def->driver.virtio.ioeventfd) < 0) + return -1; + + if (virXMLPropTristateSwitch(driver_node, "event_idx", + VIR_XML_PROP_NONE, + &def->driver.virtio.event_idx) < 0) + return -1; + + if (virXMLPropUInt(driver_node, "queues", 10, + VIR_XML_PROP_NONE, + &def->driver.virtio.queues) < 0) + return -1; + + /* There's always at least one TX/RX queue. */ + if (def->driver.virtio.queues =3D=3D 1) + def->driver.virtio.queues =3D 0; + + if (virXMLPropUInt(driver_node, "rx_queue_size", 10, + VIR_XML_PROP_NONE, + &def->driver.virtio.rx_queue_size) < 0) + return -1; + + if (virXMLPropUInt(driver_node, "tx_queue_size", 10, + VIR_XML_PROP_NONE, + &def->driver.virtio.tx_queue_size) < 0) + return -1; + + if (virXMLPropTristateSwitch(driver_node, "rss", + VIR_XML_PROP_NONE, + &def->driver.virtio.rss) < 0) + return -1; + + if (virXMLPropTristateSwitch(driver_node, "rss_hash_report", + VIR_XML_PROP_NONE, + &def->driver.virtio.rss_hash_report) = < 0) + return -1; + + if ((hostNode =3D virXPathNode("./driver/host", ctxt))) { + if (virXMLPropTristateSwitch(hostNode, "csum", VIR_XML_PROP_NO= NE, + &def->driver.virtio.host.csum) < = 0) + return -1; + + if (virXMLPropTristateSwitch(hostNode, "gso", VIR_XML_PROP_NON= E, + &def->driver.virtio.host.gso) < 0) + return -1; + + if (virXMLPropTristateSwitch(hostNode, "tso4", VIR_XML_PROP_NO= NE, + &def->driver.virtio.host.tso4) < = 0) + return -1; + + if (virXMLPropTristateSwitch(hostNode, "tso6", VIR_XML_PROP_NO= NE, + &def->driver.virtio.host.tso6) < = 0) + return -1; + + if (virXMLPropTristateSwitch(hostNode, "ecn", VIR_XML_PROP_NON= E, + &def->driver.virtio.host.ecn) < 0) + return -1; + + if (virXMLPropTristateSwitch(hostNode, "ufo", VIR_XML_PROP_NON= E, + &def->driver.virtio.host.ufo) < 0) + return -1; + + if (virXMLPropTristateSwitch(hostNode, "mrg_rxbuf", + VIR_XML_PROP_NONE, + &def->driver.virtio.host.mrg_rxbu= f) < 0) + return -1; + } + + if ((guestNode =3D virXPathNode("./driver/guest", ctxt))) { + if (virXMLPropTristateSwitch(guestNode, "csum", VIR_XML_PROP_N= ONE, + &def->driver.virtio.guest.csum) <= 0) + return -1; + + if (virXMLPropTristateSwitch(guestNode, "tso4", VIR_XML_PROP_N= ONE, + &def->driver.virtio.guest.tso4) <= 0) + return -1; + + if (virXMLPropTristateSwitch(guestNode, "tso6", VIR_XML_PROP_N= ONE, + &def->driver.virtio.guest.tso6) <= 0) + return -1; + + if (virXMLPropTristateSwitch(guestNode, "ecn", VIR_XML_PROP_NO= NE, + &def->driver.virtio.guest.ecn) < = 0) + return -1; + + if (virXMLPropTristateSwitch(guestNode, "ufo", VIR_XML_PROP_NO= NE, + &def->driver.virtio.guest.ufo) < = 0) + return -1; + } + } + + return 0; +} + + static virDomainNetDef * virDomainNetDefParseXML(virDomainXMLOption *xmlopt, xmlNodePtr node, @@ -8837,7 +8961,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, virDomainHostdevDef *hostdev; xmlNodePtr source_node =3D NULL; xmlNodePtr virtualport_node =3D NULL; - xmlNodePtr driver_node =3D NULL; xmlNodePtr filterref_node =3D NULL; xmlNodePtr actual_node =3D NULL; xmlNodePtr vlan_node =3D NULL; @@ -9009,10 +9132,6 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, def->domain_name =3D virXPathString("string(./backenddomain/@name)", c= txt); model =3D virXPathString("string(./model/@type)", ctxt); - if ((driver_node =3D virXPathNode("./driver", ctxt)) && - (virDomainVirtioOptionsParseXML(driver_node, &def->virtio) < 0)) - return NULL; - if ((filterref_node =3D virXPathNode("./filterref", ctxt))) { filter =3D virXMLPropString(filterref_node, "filter"); filterparams =3D virNWFilterParseParamAttributes(filterref_node); @@ -9373,113 +9492,8 @@ virDomainNetDefParseXML(virDomainXMLOption *xmlopt, g_clear_pointer(&def->ifname, g_free); } - if (def->type !=3D VIR_DOMAIN_NET_TYPE_HOSTDEV && - virDomainNetIsVirtioModel(def)) { - - if (virXMLPropEnum(driver_node, "name", - virDomainNetBackendTypeFromString, - VIR_XML_PROP_NONZERO, - &def->driver.virtio.name) < 0) - return NULL; - - if (virXMLPropEnum(driver_node, "txmode", - virDomainNetVirtioTxModeTypeFromString, - VIR_XML_PROP_NONZERO, - &def->driver.virtio.txmode) < 0) - return NULL; - - if (virXMLPropTristateSwitch(driver_node, "ioeventfd", - VIR_XML_PROP_NONE, - &def->driver.virtio.ioeventfd) < 0) - return NULL; - - if (virXMLPropTristateSwitch(driver_node, "event_idx", - VIR_XML_PROP_NONE, - &def->driver.virtio.event_idx) < 0) - return NULL; - - if (virXMLPropUInt(driver_node, "queues", 10, - VIR_XML_PROP_NONE, - &def->driver.virtio.queues) < 0) - return NULL; - - /* There's always at least one TX/RX queue. */ - if (def->driver.virtio.queues =3D=3D 1) - def->driver.virtio.queues =3D 0; - - if (virXMLPropUInt(driver_node, "rx_queue_size", 10, - VIR_XML_PROP_NONE, - &def->driver.virtio.rx_queue_size) < 0) - return NULL; - - if (virXMLPropUInt(driver_node, "tx_queue_size", 10, - VIR_XML_PROP_NONE, - &def->driver.virtio.tx_queue_size) < 0) - return NULL; - - if (virXMLPropTristateSwitch(driver_node, "rss", - VIR_XML_PROP_NONE, - &def->driver.virtio.rss) < 0) - return NULL; - - if (virXMLPropTristateSwitch(driver_node, "rss_hash_report", - VIR_XML_PROP_NONE, - &def->driver.virtio.rss_hash_report) = < 0) - return NULL; - - if ((tmpNode =3D virXPathNode("./driver/host", ctxt))) { - if (virXMLPropTristateSwitch(tmpNode, "csum", VIR_XML_PROP_NON= E, - &def->driver.virtio.host.csum) < = 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "gso", VIR_XML_PROP_NONE, - &def->driver.virtio.host.gso) < 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "tso4", VIR_XML_PROP_NON= E, - &def->driver.virtio.host.tso4) < = 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "tso6", VIR_XML_PROP_NON= E, - &def->driver.virtio.host.tso6) < = 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "ecn", VIR_XML_PROP_NONE, - &def->driver.virtio.host.ecn) < 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "ufo", VIR_XML_PROP_NONE, - &def->driver.virtio.host.ufo) < 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "mrg_rxbuf", - VIR_XML_PROP_NONE, - &def->driver.virtio.host.mrg_rxbu= f) < 0) - return NULL; - } - - if ((tmpNode =3D virXPathNode("./driver/guest", ctxt))) { - if (virXMLPropTristateSwitch(tmpNode, "csum", VIR_XML_PROP_NON= E, - &def->driver.virtio.guest.csum) <= 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "tso4", VIR_XML_PROP_NON= E, - &def->driver.virtio.guest.tso4) <= 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "tso6", VIR_XML_PROP_NON= E, - &def->driver.virtio.guest.tso6) <= 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "ecn", VIR_XML_PROP_NONE, - &def->driver.virtio.guest.ecn) < = 0) - return NULL; - - if (virXMLPropTristateSwitch(tmpNode, "ufo", VIR_XML_PROP_NONE, - &def->driver.virtio.guest.ufo) < = 0) - return NULL; - } - } + if (virDomainNetDefParseXMLDriver(def, ctxt) < 0) + return NULL; if (def->type !=3D VIR_DOMAIN_NET_TYPE_HOSTDEV && virDomainNetIsVirtioModel(def)) { --=20 2.37.1