From nobody Mon Feb 9 12:12:01 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=1620128481; cv=none; d=zohomail.com; s=zohoarc; b=k/OCv+b/YxOchxij0P329obyRE5VMPmL4jJtxlx0rdojmYiE+1wvajlZ3ToHxbQY0jLGFAlt5ZHXVDNyqCg9BR8ONeKIIPY3pTFjB53fDhaYgW1KstAggv5Wh3JKSfaUP0hHClbok50kbpVALwDbjKZZ64jP87QhFPJTtANSFpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1620128481; 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=9wZISSj4mpaMxTBhOiS59/wZnCGLWtivSdIPoT/VaQU=; b=KxT2bIH7Znnuazyr2SMC8EB4AHH+Co327bMPheHJV1xH9TdhmIdoNJTILZpuSnZaNcjQa5v2fktojdXTLhT5d0AsGlsZrmFzpQ4lozwVkt+90Rn0OAFc0uAFX2PshRJ5nqHhFZ54bAnjUp9uazPWOpG6vB/u8CPzFoi6J465ZCQ= 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 1620128481026392.24272641218056; Tue, 4 May 2021 04:41:21 -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-307-pmnmMbtKPnei3blk6W_s1Q-1; Tue, 04 May 2021 07:41:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A747802938; Tue, 4 May 2021 11:41:10 +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 3D70D5D703; Tue, 4 May 2021 11:41:10 +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 0814D1801263; Tue, 4 May 2021 11:41:10 +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 144Bf4IC000820 for ; Tue, 4 May 2021 07:41:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4C2125D9DD; Tue, 4 May 2021 11:41:04 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.40.195.229]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9DFF15D9D5 for ; Tue, 4 May 2021 11:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620128480; 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=9wZISSj4mpaMxTBhOiS59/wZnCGLWtivSdIPoT/VaQU=; b=WqriQ62BPb610zkL1TOkkuknUpSUWuIIVwl5D+vpOA0dG//u9KkWdXfLE5IcWiRW7n+Fr7 JDyMuLLPPwst7lJzilHkKzXzEjJsx+0aLNPh+zVqkOKQLoLBt8b7HM7NmesVeHctYpA0hj FejoAt+Z04mf9H9o6/+acE47v8TjlVw= X-MC-Unique: pmnmMbtKPnei3blk6W_s1Q-1 From: Kristina Hanicova To: libvir-list@redhat.com Subject: [PATCH v2 12/19] Refactoring virDomainChrDefParseTargetXML() to use XPath Date: Tue, 4 May 2021 13:40:06 +0200 Message-Id: <3c47d094b4535a8a936c86744928680b78656638.1620127676.git.khanicov@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com 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.15 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: Kristina Hanicova --- src/conf/domain_conf.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index df7079c7e6..5ac15fe9e8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11063,16 +11063,18 @@ virDomainChrTargetModelFromString(int devtype, static int virDomainChrDefParseTargetXML(virDomainChrDef *def, xmlNodePtr cur, - xmlXPathContextPtr ctxt G_GNUC_UNUSED, + xmlXPathContextPtr ctxt, unsigned int flags) { - xmlNodePtr child; unsigned int port; g_autofree char *targetType =3D virXMLPropString(cur, "type"); g_autofree char *targetModel =3D NULL; g_autofree char *addrStr =3D NULL; g_autofree char *portStr =3D NULL; g_autofree char *stateStr =3D NULL; + VIR_XPATH_NODE_AUTORESTORE(ctxt) + + ctxt->node =3D cur; =20 if ((def->targetType =3D virDomainChrTargetTypeFromString(def->deviceType, @@ -11083,14 +11085,7 @@ virDomainChrDefParseTargetXML(virDomainChrDef *def, return -1; } =20 - child =3D cur->children; - while (child !=3D NULL) { - if (child->type =3D=3D XML_ELEMENT_NODE && - virXMLNodeNameEqual(child, "model")) { - targetModel =3D virXMLPropString(child, "name"); - } - child =3D child->next; - } + targetModel =3D virXPathString("string(./model/@name)", ctxt); =20 if ((def->targetModel =3D virDomainChrTargetModelFromString(def->deviceType, --=20 2.30.2