mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 21:47:18 +00:00
tests: qemustatusxml2xml: Fix disk target mess
There were accidentally two disks with 'vdc' target with corresponding blockjobs which made libvirt leak some references as there are not supposed to be two blockjobs for a single disk. Fix this mess by renaming some of the disks. In addition the block job names also didn't correspond to the naming convetion which also includes the disk target. Fix it as well. Signed-off-by: Peter Krempa <pkrempa@redhat.com> ACKed-by: Eric Blake <eblake@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
parent
70a29b378a
commit
8b2798e395
@ -238,8 +238,8 @@
|
|||||||
<disk dst='vdb'/>
|
<disk dst='vdb'/>
|
||||||
<base node='libvirt-14-format'/>
|
<base node='libvirt-14-format'/>
|
||||||
</blockjob>
|
</blockjob>
|
||||||
<blockjob name='pull-vdd-libvirt-17-format' type='active-commit' state='ready'>
|
<blockjob name='commit-vde-libvirt-17-format' type='active-commit' state='ready'>
|
||||||
<disk dst='vdd'/>
|
<disk dst='vde'/>
|
||||||
<base node='libvirt-19-format'/>
|
<base node='libvirt-19-format'/>
|
||||||
<top node='libvirt-17-format'/>
|
<top node='libvirt-17-format'/>
|
||||||
</blockjob>
|
</blockjob>
|
||||||
@ -260,10 +260,10 @@
|
|||||||
</source>
|
</source>
|
||||||
</src>
|
</src>
|
||||||
</blockjob>
|
</blockjob>
|
||||||
<blockjob name='pull-vdc-libvirt-4321-format' type='copy' state='ready' shallownew='yes'>
|
<blockjob name='copy-vdd-libvirt-4321-format' type='copy' state='ready' shallownew='yes'>
|
||||||
<disk dst='vdc'/>
|
<disk dst='vdd'/>
|
||||||
</blockjob>
|
</blockjob>
|
||||||
<blockjob name='pull-vdc-libvirt-9-format' type='commit' state='running'>
|
<blockjob name='commit-vdc-libvirt-9-format' type='commit' state='running'>
|
||||||
<disk dst='vdc'/>
|
<disk dst='vdc'/>
|
||||||
<base node='libvirt-11-format'/>
|
<base node='libvirt-11-format'/>
|
||||||
<top node='libvirt-9-format'/>
|
<top node='libvirt-9-format'/>
|
||||||
@ -585,7 +585,7 @@
|
|||||||
</privateData>
|
</privateData>
|
||||||
</source>
|
</source>
|
||||||
</mirror>
|
</mirror>
|
||||||
<target dev='vdc' bus='virtio'/>
|
<target dev='vdd' bus='virtio'/>
|
||||||
<alias name='virtio-disk3'/>
|
<alias name='virtio-disk3'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0d' function='0x0'/>
|
||||||
<privateData>
|
<privateData>
|
||||||
@ -655,7 +655,7 @@
|
|||||||
<format type='qcow2'/>
|
<format type='qcow2'/>
|
||||||
<source file='/tmp/activecommit2.qcow2'/>
|
<source file='/tmp/activecommit2.qcow2'/>
|
||||||
</mirror>
|
</mirror>
|
||||||
<target dev='vdd' bus='virtio'/>
|
<target dev='vde' bus='virtio'/>
|
||||||
<alias name='virtio-disk3'/>
|
<alias name='virtio-disk3'/>
|
||||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/>
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x0e' function='0x0'/>
|
||||||
<privateData>
|
<privateData>
|
||||||
|
Loading…
Reference in New Issue
Block a user