From nobody Mon Apr 29 00:38:11 2024 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; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=intel.com 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 1626939934639339.5053631204851; Thu, 22 Jul 2021 00:45:34 -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-323-aTMgvhcmOdGhgd_UKxHbzA-1; Thu, 22 Jul 2021 03:45:31 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5B686192CC41; Thu, 22 Jul 2021 07:45:25 +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 CDF5C29173; Thu, 22 Jul 2021 07:45:23 +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 A577C1819AC2; Thu, 22 Jul 2021 07:45:20 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 16M7jJst008332 for ; Thu, 22 Jul 2021 03:45:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id F002420BB906; Thu, 22 Jul 2021 07:45:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E9F7820BB8F7 for ; Thu, 22 Jul 2021 07:45:14 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8FEB989C7DD for ; Thu, 22 Jul 2021 07:45:14 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-573-0tIXMvBtPyGEx_3lMcJ18w-1; Thu, 22 Jul 2021 03:45:10 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2021 00:44:51 -0700 Received: from duan-client-optiplex-7080.bj.intel.com ([10.238.156.101]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jul 2021 00:44:49 -0700 X-MC-Unique: aTMgvhcmOdGhgd_UKxHbzA-1 X-MC-Unique: 0tIXMvBtPyGEx_3lMcJ18w-1 X-IronPort-AV: E=McAfee;i="6200,9189,10052"; a="233399967" X-IronPort-AV: E=Sophos;i="5.84,260,1620716400"; d="scan'208";a="233399967" X-IronPort-AV: E=Sophos;i="5.84,260,1620716400"; d="scan'208";a="501650486" From: Zhenzhong Duan To: libvir-list@redhat.com Subject: [PATCH] conf: Restore ctxt's node in right scope Date: Thu, 22 Jul 2021 15:44:18 +0800 Message-Id: <20210722074418.18539-1-zhenzhong.duan@intel.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Cc: isaku.yamahata@intel.com, fiuczy@linux.ibm.com, jun.j.tian@intel.com, chenyi.qiang@intel.com, phrdina@redhat.com, Zhenzhong Duan 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.14 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-ZM-MESSAGEID: 1626939935569100001 Content-Type: text/plain; charset="utf-8" We just found is ignored in our xml. Further debug shows that ctxt's node pointer isn't restored in virDomainSecDefParseXML(), which leads to parsing of remaining elements failed. Signed-off-by: Zhenzhong Duan Reviewed-by: Pavel Hrdina --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e05ea9ba88..13b7741eb8 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14772,6 +14772,7 @@ static virDomainSecDef * virDomainSecDefParseXML(xmlNodePtr lsecNode, xmlXPathContextPtr ctxt) { + VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autoptr(virDomainSecDef) sec =3D g_new0(virDomainSecDef, 1); =20 ctxt->node =3D lsecNode; --=20 2.25.1