NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: drop virCapsPtr param from snapshot & checkpoint APIs

Browse Source 
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-11-27 13:10:21 +00:00
parent 1cd2b2d545
commit 575d9d2504
12 changed files with 29 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/conf/checkpoint_conf.c
View File

@ -115,13 +115,10 @@ virDomainCheckpointDiskDefParseXML(xmlNodePtr node,
return 0; return 0;
} }
/* flags is bitwise-or of virDomainCheckpointParseFlags. If flags /* flags is bitwise-or of virDomainCheckpointParseFlags.
* does not include VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE, then caps
* is ignored.
*/ */
static virDomainCheckpointDefPtr static virDomainCheckpointDefPtr
virDomainCheckpointDefParse(xmlXPathContextPtr ctxt, virDomainCheckpointDefParse(xmlXPathContextPtr ctxt,
virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
unsigned int flags) unsigned int flags)
@ -201,7 +198,6 @@ virDomainCheckpointDefParse(xmlXPathContextPtr ctxt,
static virDomainCheckpointDefPtr static virDomainCheckpointDefPtr
virDomainCheckpointDefParseNode(xmlDocPtr xml, virDomainCheckpointDefParseNode(xmlDocPtr xml,
xmlNodePtr root, xmlNodePtr root,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
unsigned int flags) unsigned int flags)
@ -227,12 +223,11 @@ virDomainCheckpointDefParseNode(xmlDocPtr xml,
return NULL; return NULL;
ctxt->node = root; ctxt->node = root;
return virDomainCheckpointDefParse(ctxt, caps, xmlopt, parseOpaque, flags); return virDomainCheckpointDefParse(ctxt, xmlopt, parseOpaque, flags);
} }
virDomainCheckpointDefPtr virDomainCheckpointDefPtr
virDomainCheckpointDefParseString(const char *xmlStr, virDomainCheckpointDefParseString(const char *xmlStr,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
unsigned int flags) unsigned int flags)
@ -244,7 +239,7 @@ virDomainCheckpointDefParseString(const char *xmlStr,
if ((xml = virXMLParse(NULL, xmlStr, _("(domain_checkpoint)")))) { if ((xml = virXMLParse(NULL, xmlStr, _("(domain_checkpoint)")))) {
xmlKeepBlanksDefault(keepBlanksDefault); xmlKeepBlanksDefault(keepBlanksDefault);
ret = virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(xml), ret = virDomainCheckpointDefParseNode(xml, xmlDocGetRootElement(xml),
caps, xmlopt, parseOpaque, flags); xmlopt, parseOpaque, flags);
xmlFreeDoc(xml); xmlFreeDoc(xml);
} }
xmlKeepBlanksDefault(keepBlanksDefault); xmlKeepBlanksDefault(keepBlanksDefault);
@ -446,7 +441,6 @@ virDomainCheckpointDiskDefFormat(virBufferPtr buf,
static int static int
virDomainCheckpointDefFormatInternal(virBufferPtr buf, virDomainCheckpointDefFormatInternal(virBufferPtr buf,
virDomainCheckpointDefPtr def, virDomainCheckpointDefPtr def,
virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags) unsigned int flags)
{ {
@ -505,7 +499,6 @@ virDomainCheckpointDefFormatInternal(virBufferPtr buf,
char * char *
virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def, virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags) unsigned int flags)
{ {
@ -514,7 +507,7 @@ virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def,
virCheckFlags(VIR_DOMAIN_CHECKPOINT_FORMAT_SECURE | virCheckFlags(VIR_DOMAIN_CHECKPOINT_FORMAT_SECURE |
VIR_DOMAIN_CHECKPOINT_FORMAT_NO_DOMAIN | VIR_DOMAIN_CHECKPOINT_FORMAT_NO_DOMAIN |
VIR_DOMAIN_CHECKPOINT_FORMAT_SIZE, NULL); VIR_DOMAIN_CHECKPOINT_FORMAT_SIZE, NULL);
if (virDomainCheckpointDefFormatInternal(&buf, def, caps, xmlopt, if (virDomainCheckpointDefFormatInternal(&buf, def, xmlopt,
flags) < 0) flags) < 0)
return NULL; return NULL;

2
src/conf/checkpoint_conf.h
View File

@ -74,7 +74,6 @@ virDomainCheckpointFormatConvertXMLFlags(unsigned int flags);
virDomainCheckpointDefPtr virDomainCheckpointDefPtr
virDomainCheckpointDefParseString(const char *xmlStr, virDomainCheckpointDefParseString(const char *xmlStr,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
unsigned int flags); unsigned int flags);
@ -84,7 +83,6 @@ virDomainCheckpointDefNew(void);
char * char *
virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def, virDomainCheckpointDefFormat(virDomainCheckpointDefPtr def,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags); unsigned int flags);

14
src/conf/snapshot_conf.c
View File

@ -216,13 +216,11 @@ virDomainSnapshotDiskDefParseXML(xmlNodePtr node,
} }
/* flags is bitwise-or of virDomainSnapshotParseFlags. /* flags is bitwise-or of virDomainSnapshotParseFlags.
* If flags does not include VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE, then * If flags does not include
* caps are ignored. If flags does not include
* VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL, then current is ignored. * VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL, then current is ignored.
*/ */
static virDomainSnapshotDefPtr static virDomainSnapshotDefPtr
virDomainSnapshotDefParse(xmlXPathContextPtr ctxt, virDomainSnapshotDefParse(xmlXPathContextPtr ctxt,
virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
bool *current, bool *current,
@ -420,7 +418,6 @@ virDomainSnapshotDefParse(xmlXPathContextPtr ctxt,
virDomainSnapshotDefPtr virDomainSnapshotDefPtr
virDomainSnapshotDefParseNode(xmlDocPtr xml, virDomainSnapshotDefParseNode(xmlDocPtr xml,
xmlNodePtr root, xmlNodePtr root,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
bool *current, bool *current,
@ -449,12 +446,11 @@ virDomainSnapshotDefParseNode(xmlDocPtr xml,
return NULL; return NULL;
ctxt->node = root; ctxt->node = root;
return virDomainSnapshotDefParse(ctxt, caps, xmlopt, parseOpaque, current, flags); return virDomainSnapshotDefParse(ctxt, xmlopt, parseOpaque, current, flags);
} }
virDomainSnapshotDefPtr virDomainSnapshotDefPtr
virDomainSnapshotDefParseString(const char *xmlStr, virDomainSnapshotDefParseString(const char *xmlStr,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
bool *current, bool *current,
@ -467,7 +463,7 @@ virDomainSnapshotDefParseString(const char *xmlStr,
if ((xml = virXMLParse(NULL, xmlStr, _("(domain_snapshot)")))) { if ((xml = virXMLParse(NULL, xmlStr, _("(domain_snapshot)")))) {
xmlKeepBlanksDefault(keepBlanksDefault); xmlKeepBlanksDefault(keepBlanksDefault);
ret = virDomainSnapshotDefParseNode(xml, xmlDocGetRootElement(xml), ret = virDomainSnapshotDefParseNode(xml, xmlDocGetRootElement(xml),
caps, xmlopt, parseOpaque, xmlopt, parseOpaque,
current, flags); current, flags);
xmlFreeDoc(xml); xmlFreeDoc(xml);
} }
@ -838,7 +834,6 @@ static int
virDomainSnapshotDefFormatInternal(virBufferPtr buf, virDomainSnapshotDefFormatInternal(virBufferPtr buf,
const char *uuidstr, const char *uuidstr,
virDomainSnapshotDefPtr def, virDomainSnapshotDefPtr def,
virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags) unsigned int flags)
{ {
@ -931,7 +926,6 @@ virDomainSnapshotDefFormatInternal(virBufferPtr buf,
char * char *
virDomainSnapshotDefFormat(const char *uuidstr, virDomainSnapshotDefFormat(const char *uuidstr,
virDomainSnapshotDefPtr def, virDomainSnapshotDefPtr def,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags) unsigned int flags)
{ {
@ -940,7 +934,7 @@ virDomainSnapshotDefFormat(const char *uuidstr,
virCheckFlags(VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE | virCheckFlags(VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE |
VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL | VIR_DOMAIN_SNAPSHOT_FORMAT_INTERNAL |
VIR_DOMAIN_SNAPSHOT_FORMAT_CURRENT, NULL); VIR_DOMAIN_SNAPSHOT_FORMAT_CURRENT, NULL);
if (virDomainSnapshotDefFormatInternal(&buf, uuidstr, def, caps, if (virDomainSnapshotDefFormatInternal(&buf, uuidstr, def,
xmlopt, flags) < 0) xmlopt, flags) < 0)
return NULL; return NULL;

3
src/conf/snapshot_conf.h
View File

@ -107,14 +107,12 @@ typedef enum {
unsigned int virDomainSnapshotFormatConvertXMLFlags(unsigned int flags); unsigned int virDomainSnapshotFormatConvertXMLFlags(unsigned int flags);
virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr, virDomainSnapshotDefPtr virDomainSnapshotDefParseString(const char *xmlStr,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
bool *current, bool *current,
unsigned int flags); unsigned int flags);
virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml, virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml,
xmlNodePtr root, xmlNodePtr root,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
void *parseOpaque, void *parseOpaque,
bool *current, bool *current,
@ -122,7 +120,6 @@ virDomainSnapshotDefPtr virDomainSnapshotDefParseNode(xmlDocPtr xml,
virDomainSnapshotDefPtr virDomainSnapshotDefNew(void); virDomainSnapshotDefPtr virDomainSnapshotDefNew(void);
char *virDomainSnapshotDefFormat(const char *uuidstr, char *virDomainSnapshotDefFormat(const char *uuidstr,
virDomainSnapshotDefPtr def, virDomainSnapshotDefPtr def,
virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags); unsigned int flags);
int virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapshot, int virDomainSnapshotAlignDisks(virDomainSnapshotDefPtr snapshot,

4
src/esx/esx_driver.c
View File

@ -4075,7 +4075,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc,
if (esxVI_EnsureSession(priv->primary) < 0) if (esxVI_EnsureSession(priv->primary) < 0)
return NULL; return NULL;
def = virDomainSnapshotDefParseString(xmlDesc, priv->caps, def = virDomainSnapshotDefParseString(xmlDesc,
priv->xmlopt, NULL, NULL, parse_flags); priv->xmlopt, NULL, NULL, parse_flags);
if (!def) if (!def)
@ -4176,7 +4176,7 @@ esxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
virUUIDFormat(snapshot->domain->uuid, uuid_string); virUUIDFormat(snapshot->domain->uuid, uuid_string);
xml = virDomainSnapshotDefFormat(uuid_string, &def, priv->caps, priv->xmlopt, xml = virDomainSnapshotDefFormat(uuid_string, &def, priv->xmlopt,
0); 0);
cleanup: cleanup:

8
src/qemu/qemu_checkpoint.c
View File

@ -78,7 +78,7 @@ qemuCheckpointObjFromCheckpoint(virDomainObjPtr vm,
static int static int
qemuCheckpointWriteMetadata(virDomainObjPtr vm, qemuCheckpointWriteMetadata(virDomainObjPtr vm,
virDomainMomentObjPtr checkpoint, virDomainMomentObjPtr checkpoint,
virCapsPtr caps, virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
const char *checkpointDir) const char *checkpointDir)
{ {
@ -88,7 +88,7 @@ qemuCheckpointWriteMetadata(virDomainObjPtr vm,
g_autofree char *chkDir = NULL; g_autofree char *chkDir = NULL;
g_autofree char *chkFile = NULL; g_autofree char *chkFile = NULL;
newxml = virDomainCheckpointDefFormat(def, caps, xmlopt, flags); newxml = virDomainCheckpointDefFormat(def, xmlopt, flags);
if (newxml == NULL) if (newxml == NULL)
return -1; return -1;
@ -494,7 +494,7 @@ qemuCheckpointCreateXML(virDomainPtr domain,
return NULL; return NULL;
} }
if (!(def = virDomainCheckpointDefParseString(xmlDesc, caps, driver->xmlopt, if (!(def = virDomainCheckpointDefParseString(xmlDesc, driver->xmlopt,
priv->qemuCaps, parse_flags))) priv->qemuCaps, parse_flags)))
return NULL; return NULL;
/* Unlike snapshots, the RNG schema already ensured a sane filename. */ /* Unlike snapshots, the RNG schema already ensured a sane filename. */
@ -548,7 +548,7 @@ qemuCheckpointGetXMLDesc(virDomainObjPtr vm,
chkdef = virDomainCheckpointObjGetDef(chk); chkdef = virDomainCheckpointObjGetDef(chk);
format_flags = virDomainCheckpointFormatConvertXMLFlags(flags); format_flags = virDomainCheckpointFormatConvertXMLFlags(flags);
return virDomainCheckpointDefFormat(chkdef, driver->caps, driver->xmlopt, return virDomainCheckpointDefFormat(chkdef, driver->xmlopt,
format_flags); format_flags);
} }

4
src/qemu/qemu_domain.c
View File

@ -9713,7 +9713,7 @@ qemuFindQemuImgBinary(virQEMUDriverPtr driver)
int int
qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm, qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm,
virDomainMomentObjPtr snapshot, virDomainMomentObjPtr snapshot,
virCapsPtr caps, virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
const char *snapshotDir) const char *snapshotDir)
{ {
@ -9729,7 +9729,7 @@ qemuDomainSnapshotWriteMetadata(virDomainObjPtr vm,
if (virDomainSnapshotGetCurrent(vm->snapshots) == snapshot) if (virDomainSnapshotGetCurrent(vm->snapshots) == snapshot)
flags |= VIR_DOMAIN_SNAPSHOT_FORMAT_CURRENT; flags |= VIR_DOMAIN_SNAPSHOT_FORMAT_CURRENT;
virUUIDFormat(vm->def->uuid, uuidstr); virUUIDFormat(vm->def->uuid, uuidstr);
newxml = virDomainSnapshotDefFormat(uuidstr, def, caps, xmlopt, flags); newxml = virDomainSnapshotDefFormat(uuidstr, def, xmlopt, flags);
if (newxml == NULL) if (newxml == NULL)
return -1; return -1;

20
src/qemu/qemu_driver.c
View File

@ -393,7 +393,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm,
VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_DISKS |
VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL); VIR_DOMAIN_SNAPSHOT_PARSE_INTERNAL);
int ret = -1; int ret = -1;
g_autoptr(virCaps) caps = NULL;
int direrr; int direrr;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -409,9 +408,6 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm,
goto cleanup; goto cleanup;
} }
if (!(caps = virQEMUDriverGetCapabilities(qemu_driver, false)))
goto cleanup;
VIR_INFO("Scanning for snapshots for domain %s in %s", vm->def->name, VIR_INFO("Scanning for snapshots for domain %s in %s", vm->def->name,
snapDir); snapDir);
@ -440,7 +436,7 @@ qemuDomainSnapshotLoad(virDomainObjPtr vm,
continue; continue;
} }
def = virDomainSnapshotDefParseString(xmlStr, caps, def = virDomainSnapshotDefParseString(xmlStr,
qemu_driver->xmlopt, qemu_driver->xmlopt,
priv->qemuCaps, &cur, priv->qemuCaps, &cur,
flags); flags);
@ -506,7 +502,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm,
virDomainMomentObjPtr current = NULL; virDomainMomentObjPtr current = NULL;
unsigned int flags = VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE; unsigned int flags = VIR_DOMAIN_CHECKPOINT_PARSE_REDEFINE;
int ret = -1; int ret = -1;
g_autoptr(virCaps) caps = NULL;
int direrr; int direrr;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
@ -521,9 +516,6 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm,
goto cleanup; goto cleanup;
} }
if (!(caps = virQEMUDriverGetCapabilities(qemu_driver, false)))
goto cleanup;
VIR_INFO("Scanning for checkpoints for domain %s in %s", vm->def->name, VIR_INFO("Scanning for checkpoints for domain %s in %s", vm->def->name,
chkDir); chkDir);
@ -552,7 +544,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm,
continue; continue;
} }
def = virDomainCheckpointDefParseString(xmlStr, caps, def = virDomainCheckpointDefParseString(xmlStr,
qemu_driver->xmlopt, qemu_driver->xmlopt,
priv->qemuCaps, priv->qemuCaps,
flags); flags);
@ -15793,7 +15785,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL; int align_location = VIR_DOMAIN_SNAPSHOT_LOCATION_INTERNAL;
bool align_match = true; bool align_match = true;
g_autoptr(virQEMUDriverConfig) cfg = NULL; g_autoptr(virQEMUDriverConfig) cfg = NULL;
g_autoptr(virCaps) caps = NULL;
qemuDomainObjPrivatePtr priv; qemuDomainObjPrivatePtr priv;
virDomainSnapshotState state; virDomainSnapshotState state;
g_autoptr(virDomainSnapshotDef) def = NULL; g_autoptr(virDomainSnapshotDef) def = NULL;
@ -15834,9 +15825,6 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0) if (qemuDomainSupportsCheckpointsBlockjobs(vm) < 0)
goto cleanup; goto cleanup;
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto cleanup;
if (!vm->persistent && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) { if (!vm->persistent && (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT)) {
virReportError(VIR_ERR_OPERATION_INVALID, "%s", virReportError(VIR_ERR_OPERATION_INVALID, "%s",
_("cannot halt after transient domain snapshot")); _("cannot halt after transient domain snapshot"));
@ -15849,7 +15837,7 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain,
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE) if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE)
parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE;
if (!(def = virDomainSnapshotDefParseString(xmlDesc, caps, driver->xmlopt, if (!(def = virDomainSnapshotDefParseString(xmlDesc, driver->xmlopt,
priv->qemuCaps, NULL, parse_flags))) priv->qemuCaps, NULL, parse_flags)))
goto cleanup; goto cleanup;
@ -16378,7 +16366,7 @@ qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
virUUIDFormat(snapshot->domain->uuid, uuidstr); virUUIDFormat(snapshot->domain->uuid, uuidstr);
xml = virDomainSnapshotDefFormat(uuidstr, virDomainSnapshotObjGetDef(snap), xml = virDomainSnapshotDefFormat(uuidstr, virDomainSnapshotObjGetDef(snap),
driver->caps, driver->xmlopt, driver->xmlopt,
virDomainSnapshotFormatConvertXMLFlags(flags)); virDomainSnapshotFormatConvertXMLFlags(flags));
cleanup: cleanup:

8
src/test/test_driver.c
View File

@ -884,7 +884,6 @@ testParseDomainSnapshots(testDriverPtr privconn,
goto error; goto error;
def = virDomainSnapshotDefParseNode(ctxt->doc, node, def = virDomainSnapshotDefParseNode(ctxt->doc, node,
privconn->caps,
privconn->xmlopt, privconn->xmlopt,
NULL, NULL,
&cur, &cur,
@ -8413,7 +8412,7 @@ testDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
virUUIDFormat(snapshot->domain->uuid, uuidstr); virUUIDFormat(snapshot->domain->uuid, uuidstr);
xml = virDomainSnapshotDefFormat(uuidstr, virDomainSnapshotObjGetDef(snap), xml = virDomainSnapshotDefFormat(uuidstr, virDomainSnapshotObjGetDef(snap),
privconn->caps, privconn->xmlopt, privconn->xmlopt,
virDomainSnapshotFormatConvertXMLFlags(flags)); virDomainSnapshotFormatConvertXMLFlags(flags));
cleanup: cleanup:
@ -8557,7 +8556,6 @@ testDomainSnapshotCreateXML(virDomainPtr domain,
parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE;
if (!(def = virDomainSnapshotDefParseString(xmlDesc, if (!(def = virDomainSnapshotDefParseString(xmlDesc,
privconn->caps,
privconn->xmlopt, privconn->xmlopt,
NULL, NULL, NULL, NULL,
parse_flags))) parse_flags)))
@ -9013,7 +9011,7 @@ testDomainCheckpointCreateXML(virDomainPtr domain,
goto cleanup; goto cleanup;
} }
if (!(def = virDomainCheckpointDefParseString(xmlDesc, privconn->caps, if (!(def = virDomainCheckpointDefParseString(xmlDesc,
privconn->xmlopt, NULL, privconn->xmlopt, NULL,
parse_flags))) parse_flags)))
goto cleanup; goto cleanup;
@ -9216,7 +9214,7 @@ testDomainCheckpointGetXMLDesc(virDomainCheckpointPtr checkpoint,
} }
format_flags = virDomainCheckpointFormatConvertXMLFlags(flags); format_flags = virDomainCheckpointFormatConvertXMLFlags(flags);
xml = virDomainCheckpointDefFormat(chkdef, privconn->caps, xml = virDomainCheckpointDefFormat(chkdef,
privconn->xmlopt, format_flags); privconn->xmlopt, format_flags);
cleanup: cleanup:

6
src/vbox/vbox_common.c
View File

@ -5301,7 +5301,6 @@ vboxSnapshotRedefine(virDomainPtr dom,
currentSnapshotXmlFilePath = g_strdup_printf("%s%s.xml", currentSnapshotXmlFilePath = g_strdup_printf("%s%s.xml",
machineLocationPath, snapshotMachineDesc->currentSnapshot); machineLocationPath, snapshotMachineDesc->currentSnapshot);
char *snapshotContent = virDomainSnapshotDefFormat(NULL, def, char *snapshotContent = virDomainSnapshotDefFormat(NULL, def,
data->caps,
data->xmlopt, data->xmlopt,
VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE); VIR_DOMAIN_SNAPSHOT_FORMAT_SECURE);
if (snapshotContent == NULL) { if (snapshotContent == NULL) {
@ -5431,7 +5430,7 @@ vboxDomainSnapshotCreateXML(virDomainPtr dom,
if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE) if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_VALIDATE)
parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE;
if (!(def = virDomainSnapshotDefParseString(xmlDesc, data->caps, if (!(def = virDomainSnapshotDefParseString(xmlDesc,
data->xmlopt, NULL, NULL, data->xmlopt, NULL, NULL,
parse_flags))) parse_flags)))
goto cleanup; goto cleanup;
@ -6244,7 +6243,7 @@ static char *vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
virUUIDFormat(dom->uuid, uuidstr); virUUIDFormat(dom->uuid, uuidstr);
memcpy(defdom->uuid, dom->uuid, VIR_UUID_BUFLEN); memcpy(defdom->uuid, dom->uuid, VIR_UUID_BUFLEN);
ret = virDomainSnapshotDefFormat(uuidstr, def, data->caps, data->xmlopt, 0); ret = virDomainSnapshotDefFormat(uuidstr, def, data->xmlopt, 0);
cleanup: cleanup:
VBOX_RELEASE(parent); VBOX_RELEASE(parent);
@ -6858,7 +6857,6 @@ vboxDomainSnapshotDeleteMetadataOnly(virDomainSnapshotPtr snapshot)
goto cleanup; goto cleanup;
} }
def = virDomainSnapshotDefParseString(defXml, def = virDomainSnapshotDefParseString(defXml,
data->caps,
data->xmlopt, NULL, NULL, data->xmlopt, NULL, NULL,
VIR_DOMAIN_SNAPSHOT_PARSE_DISKS | VIR_DOMAIN_SNAPSHOT_PARSE_DISKS |
VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE); VIR_DOMAIN_SNAPSHOT_PARSE_REDEFINE);

4
tests/qemudomaincheckpointxml2xmltest.c
View File

@ -53,7 +53,7 @@ testCompareXMLToXMLFiles(const char *inxml,
virTestLoadFile(outxml, &outXmlData) < 0) virTestLoadFile(outxml, &outXmlData) < 0)
return -1; return -1;
if (!(def = virDomainCheckpointDefParseString(inXmlData, driver.caps, if (!(def = virDomainCheckpointDefParseString(inXmlData,
driver.xmlopt, NULL, driver.xmlopt, NULL,
parseflags))) { parseflags))) {
if (flags & TEST_INVALID) if (flags & TEST_INVALID)
@ -91,7 +91,7 @@ testCompareXMLToXMLFiles(const char *inxml,
if (!def->parent.dom) if (!def->parent.dom)
formatflags |= VIR_DOMAIN_CHECKPOINT_FORMAT_NO_DOMAIN; formatflags |= VIR_DOMAIN_CHECKPOINT_FORMAT_NO_DOMAIN;
if (!(actual = virDomainCheckpointDefFormat(def, driver.caps, if (!(actual = virDomainCheckpointDefFormat(def,
driver.xmlopt, driver.xmlopt,
formatflags))) formatflags)))
return -1; return -1;

4
tests/qemudomainsnapshotxml2xmltest.c
View File

@ -54,7 +54,7 @@ testCompareXMLToXMLFiles(const char *inxml,
if (virTestLoadFile(outxml, &outXmlData) < 0) if (virTestLoadFile(outxml, &outXmlData) < 0)
goto cleanup; goto cleanup;
if (!(def = virDomainSnapshotDefParseString(inXmlData, driver.caps, if (!(def = virDomainSnapshotDefParseString(inXmlData,
driver.xmlopt, NULL, &cur, driver.xmlopt, NULL, &cur,
parseflags))) parseflags)))
goto cleanup; goto cleanup;
@ -69,7 +69,7 @@ testCompareXMLToXMLFiles(const char *inxml,
def->state = VIR_DOMAIN_RUNNING; def->state = VIR_DOMAIN_RUNNING;
} }
if (!(actual = virDomainSnapshotDefFormat(uuid, def, driver.caps, if (!(actual = virDomainSnapshotDefFormat(uuid, def,
driver.xmlopt, driver.xmlopt,
formatflags))) formatflags)))
goto cleanup; goto cleanup;