External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-01 17:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Format storage source node names into private data

Browse Source 
Save and restore node names if we know them or when we will be
generating them in the status XML.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Peter Krempa 2018-03-01 18:39:45 +01:00
parent 3817fa10c4
commit 38fd7aec33
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_domain.c
View File

@ -1937,6 +1937,9 @@ static int
qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt, qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
virStorageSourcePtr src) virStorageSourcePtr src)
{ {
src->nodestorage = virXPathString("string(./nodenames/nodename[@type='storage']/@name)", ctxt);
src->nodeformat = virXPathString("string(./nodenames/nodename[@type='format']/@name)", ctxt);
if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0) if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0)
return -1; return -1;
@ -1948,6 +1951,15 @@ static int
qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src, qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src,
virBufferPtr buf) virBufferPtr buf)
{ {
if (src->nodestorage || src->nodeformat) {
virBufferAddLit(buf, "<nodenames>\n");
virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<nodename type='storage' name='%s'/>\n", src->nodestorage);
virBufferEscapeString(buf, "<nodename type='format' name='%s'/>\n", src->nodeformat);
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</nodenames>\n");
}
if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0) if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0)
return -1; return -1;

4
tests/qemustatusxml2xmldata/modern-in.xml
View File

@ -309,6 +309,10 @@
<format type='qcow2'/> <format type='qcow2'/>
<source file='/var/lib/libvirt/images/base.qcow2'> <source file='/var/lib/libvirt/images/base.qcow2'>
<privateData> <privateData>
<nodenames>
<nodename type='storage' name='test-storage'/>
<nodename type='format' name='test-format'/>
</nodenames>
<relPath>base.qcow2</relPath> <relPath>base.qcow2</relPath>
</privateData> </privateData>
</source> </source>