From nobody Wed Jan 15 09:30:16 2025 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 170473255661951.20119626032147; Mon, 8 Jan 2024 08:49:16 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 8806F1AED; Mon, 8 Jan 2024 11:49:15 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 83B281AE1; Mon, 8 Jan 2024 11:08:13 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 61F6D1A4C; Mon, 8 Jan 2024 11:07:06 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6B18A1A14 for ; Mon, 8 Jan 2024 11:06:12 -0500 (EST) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-53-BzNEjaRpPxayCEwPB11KAQ-1; Mon, 08 Jan 2024 11:06:10 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8E7641019DE2 for ; Mon, 8 Jan 2024 16:06:10 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 08627C15A0C for ; Mon, 8 Jan 2024 16:06:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SUBJ_BRKN_WORDNUMS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 X-MC-Unique: BzNEjaRpPxayCEwPB11KAQ-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 15/23] qemuxml2argvtest: Use virDomainDefParseFile instead of virXMLParse+virDomainDefParseNode Date: Mon, 8 Jan 2024 17:05:45 +0100 Message-ID: <4f37d90e343195a462ad75c16190ad1345719b70.1704729291.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Message-ID-Hash: GZSAVISWYFRAYRUJ4KSYDIIBHL7RYD4Z X-Message-ID-Hash: GZSAVISWYFRAYRUJ4KSYDIIBHL7RYD4Z X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1704732557454100001 As we don't do any additional parsing of the input file in qemuxml2argvtest we can simplify the code. Signed-off-by: Peter Krempa --- tests/qemuxml2argvtest.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 226f8d4451..72a41b5cf1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -616,8 +616,6 @@ testCompareXMLToArgv(const void *data) g_autofree char *log =3D NULL; g_autoptr(virCommand) cmd =3D NULL; qemuDomainObjPrivate *priv =3D NULL; - g_autoptr(xmlDoc) xml =3D NULL; - g_autoptr(xmlXPathContext) ctxt =3D NULL; g_autoptr(virIdentity) sysident =3D virIdentityGetSystem(); /* mark test case as used */ @@ -669,10 +667,6 @@ testCompareXMLToArgv(const void *data) if (testCheckExclusiveFlags(info->flags) < 0) goto cleanup; - if (!(xml =3D virXMLParse(info->infile, NULL, "(domain_definition)", - "domain", &ctxt, NULL, false))) - goto cleanup; - virFileCacheClear(driver.qemuCapsCache); if (qemuTestCapsCacheInsert(driver.qemuCapsCache, info->qemuCaps) < 0) @@ -702,7 +696,7 @@ testCompareXMLToArgv(const void *data) parseFlags |=3D VIR_DOMAIN_DEF_PARSE_INACTIVE; - if (!(vm->def =3D virDomainDefParseNode(ctxt, driver.xmlopt, NULL, par= seFlags))) { + if (!(vm->def =3D virDomainDefParseFile(info->infile, driver.xmlopt, N= ULL, parseFlags))) { err =3D virGetLastError(); if (!err) { VIR_TEST_DEBUG("no error was reported for expected parse error= "); --=20 2.43.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org