mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 21:34:54 +03:00
conf: Fix XML formatting of RNG device info
https://bugzilla.redhat.com/show_bug.cgi?id=1035118 When outputting the XML for the RNG device, the code didn't format the PCI address info. Additionally the schema wasn't expecting the info although it was being parsed and used internally. Fix those mistakes and add test for the PCI info section.
This commit is contained in:
parent
dafdea74b0
commit
be904e4eeb
@ -3956,6 +3956,12 @@
|
||||
<optional>
|
||||
<ref name="rng-rate"/>
|
||||
</optional>
|
||||
<optional>
|
||||
<ref name="alias"/>
|
||||
</optional>
|
||||
<optional>
|
||||
<ref name="address"/>
|
||||
</optional>
|
||||
</interleave>
|
||||
</element>
|
||||
</define>
|
||||
|
@ -15832,6 +15832,11 @@ virDomainRNGDefFormat(virBufferPtr buf,
|
||||
break;
|
||||
}
|
||||
|
||||
if (virDomainDeviceInfoIsSet(&def->info, flags)) {
|
||||
if (virDomainDeviceInfoFormat(buf, &def->info, flags) < 0)
|
||||
return -1;
|
||||
}
|
||||
|
||||
virBufferAddLit(buf, " </rng>\n");
|
||||
|
||||
return 0;
|
||||
|
@ -4,4 +4,4 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
|
||||
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
|
||||
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
|
||||
-object rng-random,id=rng0 \
|
||||
-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x4
|
||||
-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7
|
||||
|
@ -18,6 +18,7 @@
|
||||
<memballoon model='virtio'/>
|
||||
<rng model='virtio'>
|
||||
<backend model='random'/>
|
||||
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
|
||||
</rng>
|
||||
</devices>
|
||||
</domain>
|
||||
|
Loading…
Reference in New Issue
Block a user