From nobody Sun Feb 8 12:37:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as permitted sender) client-ip=207.211.31.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1575469395; cv=none; d=zohomail.com; s=zohoarc; b=P5Rc7o4SMPZCL5UbotWKOsNoX14LfDPRWg3PuAjCms9kOCFXAu0p+oOhPUaxbJdbvRtxQAN9EVvjiWMiBP063UdazgCzI4b3OJE14LqIPRxdNKFikMmDav17Xk/vj2HooBXS3FkS1oLEaRjU13uwQ1sS/9yRTw1pvruCgIf+BV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1575469395; 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=04HcYFNIJBv9ffoXeeXcygFbFlTFmz/FYB06vOdsFkE=; b=GzZw1Teiu3LsGAYxIt8dW6YTdk/NA9E3lZRHeux4YYFuV9bzk9nQeyoGH53GYb3tvVuCZTQlsX5dO9dx0HWdh1thLpypVKTq4cKgu9wtYqhTJH2If3sVNSEKtsxEZItCdTB19Nqq3tZj6SJjR4sVUs9BTZ4RkujeDvR2+75P/Rg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by mx.zohomail.com with SMTPS id 1575469395709265.67688594647893; Wed, 4 Dec 2019 06:23:15 -0800 (PST) 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-347-KfK-OwChPtCi55YLSnnO6w-1; Wed, 04 Dec 2019 09:22:19 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7F655183B704; Wed, 4 Dec 2019 14:22:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BDDC691B2; Wed, 4 Dec 2019 14:22:06 +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 0177C65D34; Wed, 4 Dec 2019 14:22:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id xB4ELo55008298 for ; Wed, 4 Dec 2019 09:21:50 -0500 Received: by smtp.corp.redhat.com (Postfix) id 7406F691B2; Wed, 4 Dec 2019 14:21:50 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88EEB608F7; Wed, 4 Dec 2019 14:21:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575469394; 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=04HcYFNIJBv9ffoXeeXcygFbFlTFmz/FYB06vOdsFkE=; b=PJtp5LuQ0OAtkjGYXVeFkMh6fhF5aK73Vl8VVCtSaih/laDy/cuD3fHP5nIz11HiwE2xsN XueT8SvnhXFGjvs7MYftj/JKwn7n5IUIhk2BjLmVRxZ1IN4DF4YdfmS+vERpj4QMCR/Fp3 /rPmqTen2RdDpt2JN/Bq2I/YfNNDw/w= From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Date: Wed, 4 Dec 2019 14:21:06 +0000 Message-Id: <20191204142113.2961028-24-berrange@redhat.com> In-Reply-To: <20191204142113.2961028-1-berrange@redhat.com> References: <20191204142113.2961028-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 23/30] conf: drop virCapsPtr param from snapshot & checkpoint APIs 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.13 X-MC-Unique: KfK-OwChPtCi55YLSnnO6w-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Signed-off-by: Daniel P. Berrang=C3=A9 --- src/conf/checkpoint_conf.c | 15 ++++----------- src/conf/checkpoint_conf.h | 2 -- src/conf/snapshot_conf.c | 14 ++++---------- src/conf/snapshot_conf.h | 3 --- src/esx/esx_driver.c | 4 ++-- src/qemu/qemu_checkpoint.c | 8 ++++---- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_driver.c | 20 ++++---------------- src/test/test_driver.c | 8 +++----- src/vbox/vbox_common.c | 6 ++---- tests/qemudomaincheckpointxml2xmltest.c | 4 ++-- tests/qemudomainsnapshotxml2xmltest.c | 4 ++-- 12 files changed, 29 insertions(+), 63 deletions(-) diff --git a/src/conf/checkpoint_conf.c b/src/conf/checkpoint_conf.c index 581e382b6d..26bcfc16b7 100644 --- a/src/conf/checkpoint_conf.c +++ b/src/conf/checkpoint_conf.c @@ -115,13 +115,10 @@ virDomainCheckpointDiskDefParseXML(xmlNodePtr node, return 0; } =20 -/* flags is bitwise-or of virDomainCheckpointParseFlags. If flags - * does not include VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE, then caps - * is ignored. +/* flags is bitwise-or of virDomainCheckpointParseFlags. */ static virDomainCheckpointDefPtr virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, - virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) @@ -201,7 +198,6 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, static virDomainCheckpointDefPtr virDomainCheckpointDefParseNode(xmlDocPtr xml, xmlNodePtr root, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) @@ -227,12 +223,11 @@ virDomainCheckpointDefParseNode(xmlDocPtr xml, return NULL; =20 ctxt->node =3D root; - return virDomainCheckpointDefParse(ctxt, caps, xmlopt, parseOpaque, fl= ags); + return virDomainCheckpointDefParse(ctxt, xmlopt, parseOpaque, flags); } =20 virDomainCheckpointDefPtr virDomainCheckpointDefParseString(const char *xmlStr, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags) @@ -244,7 +239,7 @@ virDomainCheckpointDefParseString(const char *xmlStr, if ((xml =3D virXMLParse(NULL, xmlStr, _("(domain_checkpoint)")))) { xmlKeepBlanksDefault(keepBlanksDefault); ret =3D virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(= xml), - caps, xmlopt, parseOpaque, f= lags); + xmlopt, parseOpaque, flags); xmlFreeDoc(xml); } xmlKeepBlanksDefault(keepBlanksDefault); @@ -446,7 +441,6 @@ virDomainCheckpointDiskDefFormat(virBufferPtr buf, static int virDomainCheckpointDefFormatInternal(virBufferPtr buf, virDomainCheckpointDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, unsigned int flags) { @@ -505,7 +499,6 @@ virDomainCheckpointDefFormatInternal(virBufferPtr buf, =20 char * virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags) { @@ -514,7 +507,7 @@ virDomainCheckpointDefFormat(virDomainCheckpointDefPtr = def, virCheckFlags(VIR_DOMAIN_CHECKPOINT_FORMAT_SECURE | VIR_DOMAIN_CHECKPOINT_FORMAT_NO_DOMAIN | VIR_DOMAIN_CHECKPOINT_FORMAT_SIZE, NULL); - if (virDomainCheckpointDefFormatInternal(&buf, def, caps, xmlopt, + if (virDomainCheckpointDefFormatInternal(&buf, def, xmlopt, flags) < 0) return NULL; =20 diff --git a/src/conf/checkpoint_conf.h b/src/conf/checkpoint_conf.h index 982096abed..ee5d210593 100644 --- a/src/conf/checkpoint_conf.h +++ b/src/conf/checkpoint_conf.h @@ -74,7 +74,6 @@ virDomainCheckpointFormatConvertXMLFlags(unsigned int fla= gs); =20 virDomainCheckpointDefPtr virDomainCheckpointDefParseString(const char *xmlStr, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, unsigned int flags); @@ -84,7 +83,6 @@ virDomainCheckpointDefNew(void); =20 char * virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags); =20 diff --git a/src/conf/snapshot_conf.c b/src/conf/snapshot_conf.c index af882c6048..2bd4d6a276 100644 --- a/src/conf/snapshot_conf.c +++ b/src/conf/snapshot_conf.c @@ -216,13 +216,11 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node, } =20 /* flags is bitwise-or of virDomainSnapshotParseFlags. - * If flags does not include VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE, then - * caps are ignored. If flags does not include + * If flags does not include * VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL, then current is ignored. */ static virDomainSnapshotDefPtr virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, - virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, void *parseOpaque, bool *current, @@ -420,7 +418,6 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml, xmlNodePtr root, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, bool *current, @@ -449,12 +446,11 @@ virDomainSnapshotDefParseNode(xmlDocPtr xml, return NULL; =20 ctxt->node =3D root; - return virDomainSnapshotDefParse(ctxt, caps, xmlopt, parseOpaque, curr= ent, flags); + return virDomainSnapshotDefParse(ctxt, xmlopt, parseOpaque, current, f= lags); } =20 virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, void *parseOpaque, bool *current, @@ -467,7 +463,7 @@ virDomainSnapshotDefParseString(const char *xmlStr, if ((xml =3D virXMLParse(NULL, xmlStr, _("(domain_snapshot)")))) { xmlKeepBlanksDefault(keepBlanksDefault); ret =3D virDomainSnapshotDefParseNode(xml, xmlDocGetRootElement(xm= l), - caps, xmlopt, parseOpaque, + xmlopt, parseOpaque, current, flags); xmlFreeDoc(xml); } @@ -838,7 +834,6 @@ static int virDomainSnapshotDefFormatInternal(virBufferPtr buf, const char *uuidstr, virDomainSnapshotDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, unsigned int flags) { @@ -931,7 +926,6 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf, char * virDomainSnapshotDefFormat(const char *uuidstr, virDomainSnapshotDefPtr def, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags) { @@ -940,7 +934,7 @@ virDomainSnapshotDefFormat(const char *uuidstr, virCheckFlags(VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE | VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL | VIR_DOMAIN_SNAPSHOT_FORMAT_CURRENT, NULL); - if (virDomainSnapshotDefFormatInternal(&buf, uuidstr, def, caps, + if (virDomainSnapshotDefFormatInternal(&buf, uuidstr, def, xmlopt, flags) < 0) return NULL; =20 diff --git a/src/conf/snapshot_conf.h b/src/conf/snapshot_conf.h index b0b52e6a34..c02d0fa263 100644 --- a/src/conf/snapshot_conf.h +++ b/src/conf/snapshot_conf.h @@ -107,14 +107,12 @@ typedef enum { unsigned int virDomainSnapshotFormatConvertXMLFlags(unsigned int flags); =20 virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr, - virCapsPtr caps, virDomainXMLOption= Ptr xmlopt, void *parseOpaque, bool *current, unsigned int flags= ); virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml, xmlNodePtr root, - virCapsPtr caps, virDomainXMLOptionPt= r xmlopt, void *parseOpaque, bool *current, @@ -122,7 +120,6 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(x= mlDocPtr xml, virDomainSnapshotDefPtr virDomainSnapshotDefNew(void); char *virDomainSnapshotDefFormat(const char *uuidstr, virDomainSnapshotDefPtr def, - virCapsPtr caps, virDomainXMLOptionPtr xmlopt, unsigned int flags); int virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapshot, diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 9cfdd3bf49..0ede65279a 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -4075,7 +4075,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const= char *xmlDesc, if (esxVI_EnsureSession(priv->primary) < 0) return NULL; =20 - def =3D virDomainSnapshotDefParseString(xmlDesc, priv->caps, + def =3D virDomainSnapshotDefParseString(xmlDesc, priv->xmlopt, NULL, NULL, parse_= flags); =20 if (!def) @@ -4176,7 +4176,7 @@ esxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snap= shot, =20 virUUIDFormat(snapshot->domain->uuid, uuid_string); =20 - xml =3D virDomainSnapshotDefFormat(uuid_string, &def, priv->caps, priv= ->xmlopt, + xml =3D virDomainSnapshotDefFormat(uuid_string, &def, priv->xmlopt, 0); =20 cleanup: diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index a601030637..2101932a28 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -78,7 +78,7 @@ qemuCheckpointObjFromCheckpoint(virDomainObjPtr vm, static int qemuCheckpointWriteMetadata(virDomainObjPtr vm, virDomainMomentObjPtr checkpoint, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, const char *checkpointDir) { @@ -88,7 +88,7 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm, g_autofree char *chkDir =3D NULL; g_autofree char *chkFile =3D NULL; =20 - newxml =3D virDomainCheckpointDefFormat(def, caps, xmlopt, flags); + newxml =3D virDomainCheckpointDefFormat(def, xmlopt, flags); if (newxml =3D=3D NULL) return -1; =20 @@ -494,7 +494,7 @@ qemuCheckpointCreateXML(virDomainPtr domain, return NULL; } =20 - if (!(def =3D virDomainCheckpointDefParseString(xmlDesc, caps, driver-= >xmlopt, + if (!(def =3D virDomainCheckpointDefParseString(xmlDesc, driver->xmlop= t, priv->qemuCaps, parse_fl= ags))) return NULL; /* Unlike snapshots, the RNG schema already ensured a sane filename. */ @@ -548,7 +548,7 @@ qemuCheckpointGetXMLDesc(virDomainObjPtr vm, chkdef =3D virDomainCheckpointObjGetDef(chk); =20 format_flags =3D virDomainCheckpointFormatConvertXMLFlags(flags); - return virDomainCheckpointDefFormat(chkdef, driver->caps, driver->xmlo= pt, + return virDomainCheckpointDefFormat(chkdef, driver->xmlopt, format_flags); } =20 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index ee99759ded..594c4d5400 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -9714,7 +9714,7 @@ qemuFindQemuImgBinary(virQEMUDriverPtr driver) int qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, virDomainMomentObjPtr snapshot, - virCapsPtr caps, + virCapsPtr caps G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt, const char *snapshotDir) { @@ -9730,7 +9730,7 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, if (virDomainSnapshotGetCurrent(vm->snapshots) =3D=3D snapshot) flags |=3D VIR_DOMAIN_SNAPSHOT_FORMAT_CURRENT; virUUIDFormat(vm->def->uuid, uuidstr); - newxml =3D virDomainSnapshotDefFormat(uuidstr, def, caps, xmlopt, flag= s); + newxml =3D virDomainSnapshotDefFormat(uuidstr, def, xmlopt, flags); if (newxml =3D=3D NULL) return -1; =20 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0aefe8cd2a..b544bed7c1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -393,7 +393,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL); int ret =3D -1; - g_autoptr(virCaps) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -409,9 +408,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, goto cleanup; } =20 - if (!(caps =3D virQEMUDriverGetCapabilities(qemu_driver, false))) - goto cleanup; - VIR_INFO("Scanning for snapshots for domain %s in %s", vm->def->name, snapDir); =20 @@ -440,7 +436,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm, continue; } =20 - def =3D virDomainSnapshotDefParseString(xmlStr, caps, + def =3D virDomainSnapshotDefParseString(xmlStr, qemu_driver->xmlopt, priv->qemuCaps, &cur, flags); @@ -506,7 +502,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, virDomainMomentObjPtr current =3D NULL; unsigned int flags =3D VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; int ret =3D -1; - g_autoptr(virCaps) caps =3D NULL; int direrr; qemuDomainObjPrivatePtr priv; =20 @@ -521,9 +516,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, goto cleanup; } =20 - if (!(caps =3D virQEMUDriverGetCapabilities(qemu_driver, false))) - goto cleanup; - VIR_INFO("Scanning for checkpoints for domain %s in %s", vm->def->name, chkDir); =20 @@ -552,7 +544,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, continue; } =20 - def =3D virDomainCheckpointDefParseString(xmlStr, caps, + def =3D virDomainCheckpointDefParseString(xmlStr, qemu_driver->xmlopt, priv->qemuCaps, flags); @@ -15751,7 +15743,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, int align_location =3D VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; bool align_match =3D true; g_autoptr(virQEMUDriverConfig) cfg =3D NULL; - g_autoptr(virCaps) caps =3D NULL; qemuDomainObjPrivatePtr priv; virDomainSnapshotState state; g_autoptr(virDomainSnapshotDef) def =3D NULL; @@ -15792,9 +15783,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) goto cleanup; =20 - if (!(caps =3D virQEMUDriverGetCapabilities(driver, false))) - goto cleanup; - if (!vm->persistent && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot halt after transient domain snapshot")); @@ -15807,7 +15795,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE) parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; =20 - if (!(def =3D virDomainSnapshotDefParseString(xmlDesc, caps, driver->x= mlopt, + if (!(def =3D virDomainSnapshotDefParseString(xmlDesc, driver->xmlopt, priv->qemuCaps, NULL, pars= e_flags))) goto cleanup; =20 @@ -16336,7 +16324,7 @@ qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr s= napshot, virUUIDFormat(snapshot->domain->uuid, uuidstr); =20 xml =3D virDomainSnapshotDefFormat(uuidstr, virDomainSnapshotObjGetDef= (snap), - driver->caps, driver->xmlopt, + driver->xmlopt, virDomainSnapshotFormatConvertXMLFlag= s(flags)); =20 cleanup: diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 788d5d3676..f3d6061625 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -884,7 +884,6 @@ testParseDomainSnapshots(testDriverPtr privconn, goto error; =20 def =3D virDomainSnapshotDefParseNode(ctxt->doc, node, - privconn->caps, privconn->xmlopt, NULL, &cur, @@ -8413,7 +8412,7 @@ testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr sna= pshot, virUUIDFormat(snapshot->domain->uuid, uuidstr); =20 xml =3D virDomainSnapshotDefFormat(uuidstr, virDomainSnapshotObjGetDef= (snap), - privconn->caps, privconn->xmlopt, + privconn->xmlopt, virDomainSnapshotFormatConvertXMLFlag= s(flags)); =20 cleanup: @@ -8557,7 +8556,6 @@ testDomainSnapshotCreateXML(virDomainPtr domain, parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; =20 if (!(def =3D virDomainSnapshotDefParseString(xmlDesc, - privconn->caps, privconn->xmlopt, NULL, NULL, parse_flags))) @@ -9013,7 +9011,7 @@ testDomainCheckpointCreateXML(virDomainPtr domain, goto cleanup; } =20 - if (!(def =3D virDomainCheckpointDefParseString(xmlDesc, privconn->cap= s, + if (!(def =3D virDomainCheckpointDefParseString(xmlDesc, privconn->xmlopt, NULL, parse_flags))) goto cleanup; @@ -9216,7 +9214,7 @@ testDomainCheckpointGetXMLDesc(virDomainCheckpointPtr= checkpoint, } =20 format_flags =3D virDomainCheckpointFormatConvertXMLFlags(flags); - xml =3D virDomainCheckpointDefFormat(chkdef, privconn->caps, + xml =3D virDomainCheckpointDefFormat(chkdef, privconn->xmlopt, format_flags); =20 cleanup: diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 1703120928..2930a2f0e1 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -5301,7 +5301,6 @@ vboxSnapshotRedefine(virDomainPtr dom, currentSnapshotXmlFilePath =3D g_strdup_printf("%s%s.xml", machineLocationPath, = snapshotMachineDesc->currentSnapshot); char *snapshotContent =3D virDomainSnapshotDefFormat(NULL, def, - data->caps, data->xmlopt, VIR_DOMAIN_SNAP= SHOT_FORMAT_SECURE); if (snapshotContent =3D=3D NULL) { @@ -5431,7 +5430,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom, if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE) parse_flags |=3D VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; =20 - if (!(def =3D virDomainSnapshotDefParseString(xmlDesc, data->caps, + if (!(def =3D virDomainSnapshotDefParseString(xmlDesc, data->xmlopt, NULL, NULL, parse_flags))) goto cleanup; @@ -6244,7 +6243,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSn= apshotPtr snapshot, =20 virUUIDFormat(dom->uuid, uuidstr); memcpy(defdom->uuid, dom->uuid, VIR_UUID_BUFLEN); - ret =3D virDomainSnapshotDefFormat(uuidstr, def, data->caps, data->xml= opt, 0); + ret =3D virDomainSnapshotDefFormat(uuidstr, def, data->xmlopt, 0); =20 cleanup: VBOX_RELEASE(parent); @@ -6858,7 +6857,6 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapsho= tPtr snapshot) goto cleanup; } def =3D virDomainSnapshotDefParseString(defXml, - data->caps, data->xmlopt, NULL, NULL, VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_REDEFI= NE); diff --git a/tests/qemudomaincheckpointxml2xmltest.c b/tests/qemudomainchec= kpointxml2xmltest.c index 49e8cddeb3..4d6904a592 100644 --- a/tests/qemudomaincheckpointxml2xmltest.c +++ b/tests/qemudomaincheckpointxml2xmltest.c @@ -53,7 +53,7 @@ testCompareXMLToXMLFiles(const char *inxml, virTestLoadFile(outxml, &outXmlData) < 0) return -1; =20 - if (!(def =3D virDomainCheckpointDefParseString(inXmlData, driver.caps, + if (!(def =3D virDomainCheckpointDefParseString(inXmlData, driver.xmlopt, NULL, parseflags))) { if (flags & TEST_INVALID) @@ -91,7 +91,7 @@ testCompareXMLToXMLFiles(const char *inxml, if (!def->parent.dom) formatflags |=3D VIR_DOMAIN_CHECKPOINT_FORMAT_NO_DOMAIN; =20 - if (!(actual =3D virDomainCheckpointDefFormat(def, driver.caps, + if (!(actual =3D virDomainCheckpointDefFormat(def, driver.xmlopt, formatflags))) return -1; diff --git a/tests/qemudomainsnapshotxml2xmltest.c b/tests/qemudomainsnapsh= otxml2xmltest.c index fd3bb04e26..6bff5d14f5 100644 --- a/tests/qemudomainsnapshotxml2xmltest.c +++ b/tests/qemudomainsnapshotxml2xmltest.c @@ -54,7 +54,7 @@ testCompareXMLToXMLFiles(const char *inxml, if (virTestLoadFile(outxml, &outXmlData) < 0) goto cleanup; =20 - if (!(def =3D virDomainSnapshotDefParseString(inXmlData, driver.caps, + if (!(def =3D virDomainSnapshotDefParseString(inXmlData, driver.xmlopt, NULL, &cur, parseflags))) goto cleanup; @@ -69,7 +69,7 @@ testCompareXMLToXMLFiles(const char *inxml, def->state =3D VIR_DOMAIN_RUNNING; } =20 - if (!(actual =3D virDomainSnapshotDefFormat(uuid, def, driver.caps, + if (!(actual =3D virDomainSnapshotDefFormat(uuid, def, driver.xmlopt, formatflags))) goto cleanup; --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list