From nobody Sun Feb 8 14:57:00 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=1663577757; cv=none; d=zohomail.com; s=zohoarc; b=a42wwBNV6fTGD1EHXNy3WXxmuQzzKYxhtIL12ws6lXd+YaySNwly0fNJlYZ29SjTktuQOonuk2yBd6q4fyZvycxFslSiu3wwWrdHJPqSs3gchfVbAYChsrHTDpZ8pwBaxnBHyDk89YCkmRfiKSv9/3bFwAlrb6vuEM8MXAeyQXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663577757; 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=iUBnV3As86BEAwbfYuvz6300JemED/HkZB5Oey6e3QM=; b=Pp0BZTftZAPRNHMYTjYM1iusAAV30wX5hLxOsiDvSF+IBgbQHH5oPpXetOxPqP1h8qlLIaYD28ZW2PJ+hr/vbjWV5Uii9TqaFDJj6bqpXufJbkjtJXI9A/2xBcrv8S7BssFmwln9uoQXdwBExWD/evPhgUPz6OaWdly01qY2LYE= 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 166357775758389.49511263231739; Mon, 19 Sep 2022 01:55:57 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-73-NZfs3DMDOCaSLRWiqy8AJA-1; Mon, 19 Sep 2022 04:55:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A4CE7101245D; Mon, 19 Sep 2022 08:55:47 +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 8F85A2086F61; Mon, 19 Sep 2022 08:55:47 +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 7EF621946594; Mon, 19 Sep 2022 08:55:47 +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 0796619465B1 for ; Mon, 19 Sep 2022 08:55:46 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id F11DA40C6EC4; Mon, 19 Sep 2022 08:55:45 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BC6E40C6EC3 for ; Mon, 19 Sep 2022 08:55:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663577756; 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=iUBnV3As86BEAwbfYuvz6300JemED/HkZB5Oey6e3QM=; b=V+DVeWCdw1pDXp3pFB0i2rsTItNBbt0yo6PXvmE1y+wAsmrXXjpNcC8Wy4MZ+ZdImm4pzk Sr73PN52ph2jVpCq+9eW7Q1dVXr/iGQbAFTnNZLjfN6L23y+KyrTwW4/4Ga7qQsHvaenRa iOjPNZyjs+JZdZpSAwONBso6VgxLuKw= X-MC-Unique: NZfs3DMDOCaSLRWiqy8AJA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 24/37] conf: domain: Move 'virDomainChrSourceReconnectDefParseXML' Date: Mon, 19 Sep 2022 10:55:09 +0200 Message-Id: <3513bc43bb64a40bd47200eb0858823bdc249063.1663577578.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.4 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: 1663577759140100003 Content-Type: text/plain; charset="utf-8" Move the function in place of its forward declaration. Signed-off-by: Peter Krempa Reviewed-by: J=C3=A1n Tomko --- src/conf/domain_conf.c | 48 ++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 27 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 35843f6b72..dde34404f1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1481,7 +1481,27 @@ virDomainChrSourceDefFormat(virBuffer *buf, static int virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDef *def, xmlNodePtr node, - xmlXPathContextPtr ctxt); + xmlXPathContextPtr ctxt) +{ + VIR_XPATH_NODE_AUTORESTORE(ctxt) + xmlNodePtr cur; + + ctxt->node =3D node; + + if ((cur =3D virXPathNode("./reconnect", ctxt))) { + if (virXMLPropTristateBool(cur, "enabled", VIR_XML_PROP_NONE, + &def->enabled) < 0) + return -1; + + if (def->enabled =3D=3D VIR_TRISTATE_BOOL_YES) { + if (virXMLPropUInt(cur, "timeout", 10, VIR_XML_PROP_REQUIRED, + &def->timeout) < 0) + return -1; + } + } + + return 0; +} static int virDomainObjOnceInit(void) @@ -8777,32 +8797,6 @@ virDomainNetAppendIPAddress(virDomainNetDef *def, } -static int -virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDef *def, - xmlNodePtr node, - xmlXPathContextPtr ctxt) -{ - VIR_XPATH_NODE_AUTORESTORE(ctxt) - xmlNodePtr cur; - - ctxt->node =3D node; - - if ((cur =3D virXPathNode("./reconnect", ctxt))) { - if (virXMLPropTristateBool(cur, "enabled", VIR_XML_PROP_NONE, - &def->enabled) < 0) - return -1; - - if (def->enabled =3D=3D VIR_TRISTATE_BOOL_YES) { - if (virXMLPropUInt(cur, "timeout", 10, VIR_XML_PROP_REQUIRED, - &def->timeout) < 0) - return -1; - } - } - - return 0; -} - - static int virDomainNetTeamingInfoParseXML(xmlXPathContextPtr ctxt, virDomainNetTeamingInfo **teaming) --=20 2.37.1