External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-05 00:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Modify <migrationSource> to look like <disk>

Browse Source 
When adding <migrationSource> I've used a slightly unusual approach. To
allow using the disk source XML parser and formatter convert
<migrationSource> to look like <disk>. This means that <source> will be
added as a subelement of <migrationSource> rather than being formatted
inline.

Conversion from the old format in the parser is very simple as it
involves only moving the XPath context current node slightly if the new
format is found.

The status XML to XML test shows that the upgrade is done correctly.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2019-03-22 16:48:54 +01:00
parent 1af846dd27
commit 0c10edadde
3 changed files with 43 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/qemu/qemu_domain.c
View File

@ -2343,28 +2343,21 @@ qemuDomainObjPrivateXMLFormatPR(virBufferPtr buf,
static int static int
qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf, qemuDomainObjPrivateXMLFormatNBDMigrationSource(virBufferPtr buf,
virStorageSourcePtr src) virStorageSourcePtr src,
virDomainXMLOptionPtr xmlopt)
{ {
VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER;
VIR_AUTOCLEAN(virBuffer) privateDataBuf = VIR_BUFFER_INITIALIZER;
int ret = -1; int ret = -1;
virBufferSetChildIndent(&childBuf, buf); virBufferSetChildIndent(&childBuf, buf);
virBufferSetChildIndent(&privateDataBuf, &childBuf);
virBufferAsprintf(&attrBuf, " type='%s' format='%s'", virBufferAsprintf(&attrBuf, " type='%s' format='%s'",
virStorageTypeToString(src->type), virStorageTypeToString(src->type),
virStorageFileFormatTypeToString(src->format)); virStorageFileFormatTypeToString(src->format));
if (virDomainStorageSourceFormat(&attrBuf, &childBuf, src, if (virDomainDiskSourceFormat(&childBuf, src, 0, false,
VIR_DOMAIN_DEF_FORMAT_STATUS) < 0) VIR_DOMAIN_DEF_FORMAT_STATUS, xmlopt) < 0)
goto cleanup;
if (qemuStorageSourcePrivateDataFormat(src, &privateDataBuf) < 0)
goto cleanup;
if (virXMLFormatElement(&childBuf, "privateData", NULL, &privateDataBuf) < 0)
goto cleanup; goto cleanup;
if (virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf) < 0) if (virXMLFormatElement(buf, "migrationSource", &attrBuf, &childBuf) < 0)
@ -2381,6 +2374,7 @@ static int
qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf, qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf,
virDomainObjPtr vm) virDomainObjPtr vm)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData;
VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) attrBuf = VIR_BUFFER_INITIALIZER;
VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) childBuf = VIR_BUFFER_INITIALIZER;
size_t i; size_t i;
@ -2399,7 +2393,8 @@ qemuDomainObjPrivateXMLFormatNBDMigration(virBufferPtr buf,
if (diskPriv->migrSource && if (diskPriv->migrSource &&
qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf, qemuDomainObjPrivateXMLFormatNBDMigrationSource(&childBuf,
diskPriv->migrSource) < 0) diskPriv->migrSource,
priv->driver->xmlopt) < 0)
goto cleanup; goto cleanup;
if (virXMLFormatElement(buf, "disk", &attrBuf, &childBuf) < 0) if (virXMLFormatElement(buf, "disk", &attrBuf, &childBuf) < 0)
@ -2723,6 +2718,7 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
char *type = NULL; char *type = NULL;
int ret = -1; int ret = -1;
VIR_AUTOUNREF(virStorageSourcePtr) migrSource = NULL; VIR_AUTOUNREF(virStorageSourcePtr) migrSource = NULL;
xmlNodePtr sourceNode;
ctxt->node = node; ctxt->node = node;
@ -2758,6 +2754,11 @@ qemuDomainObjPrivateXMLParseJobNBDSource(xmlNodePtr node,
goto cleanup; goto cleanup;
} }
/* newer libvirt uses the <source> subelement instead of formatting the
* source directly into <migrationSource> */
if ((sourceNode = virXPathNode("./source", ctxt)))
ctxt->node = sourceNode;
if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource, if (virDomainStorageSourceParse(ctxt->node, ctxt, migrSource,
VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0) VIR_DOMAIN_DEF_PARSE_STATUS, NULL) < 0)
goto cleanup; goto cleanup;

18
tests/qemustatusxml2xmldata/migration-out-nbd-tls-in.xml
View File

@ -237,14 +237,16 @@
</qemuCaps> </qemuCaps>
<job type='none' async='migration out' phase='perform3' flags='0x0'> <job type='none' async='migration out' phase='perform3' flags='0x0'>
<disk dev='vdb' migrating='yes'> <disk dev='vdb' migrating='yes'>
<migrationSource type='network' format='raw' protocol='nbd' name='drive-virtio-disk1' tlsFromConfig='0'> <migrationSource type='network' format='raw'>
<host name='andariel.usersys.redhat.com' port='49152'/> <source protocol='nbd' name='drive-virtio-disk1' tlsFromConfig='0'>
<privateData> <host name='andariel.usersys.redhat.com' port='49152'/>
<nodenames> <privateData>
<nodename type='storage' name='migration-vdb-storage'/> <nodenames>
<nodename type='format' name='migration-vdb-format'/> <nodename type='storage' name='migration-vdb-storage'/>
</nodenames> <nodename type='format' name='migration-vdb-format'/>
</privateData> </nodenames>
</privateData>
</source>
</migrationSource> </migrationSource>
</disk> </disk>
<disk dev='vdc' migrating='yes'> <disk dev='vdc' migrating='yes'>

36
tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
View File

@ -237,25 +237,29 @@
</qemuCaps> </qemuCaps>
<job type='none' async='migration out' phase='perform3' flags='0x0'> <job type='none' async='migration out' phase='perform3' flags='0x0'>
<disk dev='vdb' migrating='yes'> <disk dev='vdb' migrating='yes'>
<migrationSource type='network' format='raw' protocol='nbd' name='drive-virtio-disk1' tlsFromConfig='0'> <migrationSource type='network' format='raw'>
<host name='andariel.usersys.redhat.com' port='49152'/> <source protocol='nbd' name='drive-virtio-disk1' tlsFromConfig='0'>
<privateData> <host name='andariel.usersys.redhat.com' port='49152'/>
<nodenames> <privateData>
<nodename type='storage' name='migration-vdb-storage'/> <nodenames>
<nodename type='format' name='migration-vdb-format'/> <nodename type='storage' name='migration-vdb-storage'/>
</nodenames> <nodename type='format' name='migration-vdb-format'/>
</privateData> </nodenames>
</privateData>
</source>
</migrationSource> </migrationSource>
</disk> </disk>
<disk dev='vdc' migrating='yes'> <disk dev='vdc' migrating='yes'>
<migrationSource type='network' format='raw' protocol='nbd' name='drive-virtio-disk2' tlsFromConfig='0'> <migrationSource type='network' format='raw'>
<host name='andariel.usersys.redhat.com' port='49152'/> <source protocol='nbd' name='drive-virtio-disk2' tlsFromConfig='0'>
<privateData> <host name='andariel.usersys.redhat.com' port='49152'/>
<nodenames> <privateData>
<nodename type='storage' name='migration-vdc-storage'/> <nodenames>
<nodename type='format' name='migration-vdc-format'/> <nodename type='storage' name='migration-vdc-storage'/>
</nodenames> <nodename type='format' name='migration-vdc-format'/>
</privateData> </nodenames>
</privateData>
</source>
</migrationSource> </migrationSource>
</disk> </disk>
<disk dev='hda' migrating='no'/> <disk dev='hda' migrating='no'/>