External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: command: Make RNG backend device IDs unique

Browse Source 
Libvirt didn't prefix the random number generator backend object alias
with any string thus the device alias and object alias were identical.

To avoid possible problems, rename the alias for the backend object and
tweak tests to comply with the change.

Signed-off-by: Luyao Huang <lhuang@redhat.com>
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Luyao Huang 2015-01-17 13:09:34 +08:00 committed by Peter Krempa
parent 58a4eee81a
commit 98e982b455
11 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qemu/qemu_command.c
View File

@ -6177,7 +6177,7 @@ qemuBuildRNGBackendArgs(virCommandPtr cmd,
goto cleanup; goto cleanup;
} }
virBufferAsprintf(&buf, "rng-random,id=%s,filename=%s", virBufferAsprintf(&buf, "rng-random,id=obj%s,filename=%s",
dev->info.alias, dev->source.file); dev->info.alias, dev->source.file);
virCommandAddArg(cmd, "-object"); virCommandAddArg(cmd, "-object");
@ -6200,7 +6200,7 @@ qemuBuildRNGBackendArgs(virCommandPtr cmd,
virCommandAddArgList(cmd, "-chardev", backend, NULL); virCommandAddArgList(cmd, "-chardev", backend, NULL);
virCommandAddArg(cmd, "-object"); virCommandAddArg(cmd, "-object");
virCommandAddArgFormat(cmd, "rng-egd,chardev=char%s,id=%s", virCommandAddArgFormat(cmd, "rng-egd,chardev=char%s,id=obj%s",
dev->info.alias, dev->info.alias); dev->info.alias, dev->info.alias);
break; break;
@ -6233,13 +6233,13 @@ qemuBuildRNGDevStr(virDomainDefPtr def,
} }
if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)
virBufferAsprintf(&buf, "virtio-rng-ccw,rng=%s", dev->info.alias); virBufferAsprintf(&buf, "virtio-rng-ccw,rng=obj%s,id=%s", dev->info.alias, dev->info.alias);
else if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390) else if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390)
virBufferAsprintf(&buf, "virtio-rng-s390,rng=%s", dev->info.alias); virBufferAsprintf(&buf, "virtio-rng-s390,rng=obj%s,id=%s", dev->info.alias, dev->info.alias);
else if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO) else if (dev->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO)
virBufferAsprintf(&buf, "virtio-rng-device,rng=%s", dev->info.alias); virBufferAsprintf(&buf, "virtio-rng-device,rng=obj%s,id=%s", dev->info.alias, dev->info.alias);
else else
virBufferAsprintf(&buf, "virtio-rng-pci,rng=%s", dev->info.alias); virBufferAsprintf(&buf, "virtio-rng-pci,rng=obj%s,id=%s", dev->info.alias, dev->info.alias);
if (dev->rate > 0) { if (dev->rate > 0) {
virBufferAsprintf(&buf, ",max-bytes=%u", dev->rate); virBufferAsprintf(&buf, ",max-bytes=%u", dev->rate);

4
tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args
View File

@ -11,5 +11,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ -net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \
-device virtconsole,chardev=charconsole1,id=console1 \ -device virtconsole,chardev=charconsole1,id=console1 \
-device virtio-balloon-device,id=balloon0 \ -device virtio-balloon-device,id=balloon0 \
-object rng-random,id=rng0,filename=/dev/random \ -object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-device,rng=rng0 -device virtio-rng-device,rng=objrng0,id=rng0

4
tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args
View File

@ -10,5 +10,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ -net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \
-device virtconsole,chardev=charconsole1,id=console1 \ -device virtconsole,chardev=charconsole1,id=console1 \
-device virtio-balloon-device,id=balloon0 \ -device virtio-balloon-device,id=balloon0 \
-object rng-random,id=rng0,filename=/dev/random \ -object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-device,rng=rng0 -device virtio-rng-device,rng=objrng0,id=rng0

4
tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args
View File

@ -10,5 +10,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \ -net user,vlan=0,name=hostnet0 -serial pty -chardev pty,id=charconsole1 \
-device virtconsole,chardev=charconsole1,id=console1 \ -device virtconsole,chardev=charconsole1,id=console1 \
-device virtio-balloon-device,id=balloon0 \ -device virtio-balloon-device,id=balloon0 \
-object rng-random,id=rng0,filename=/dev/random \ -object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-device,rng=rng0 -device virtio-rng-device,rng=objrng0,id=rng0

3
tests/qemuxml2argvdata/qemuxml2argv-s390-piix-controllers.args
View File

@ -8,4 +8,5 @@ file=/dev/HostVG/QEMUGuest1,if=none,id=drive-virtio-disk0 \
-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-chardev pty,id=charconsole0 \ -chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \ -device virtconsole,chardev=charconsole0,id=console0 \
-object rng-random,id=rng0,filename=/dev/hwrng -device virtio-rng-s390,rng=rng0 -object rng-random,id=objrng0,filename=/dev/hwrng \
-device virtio-rng-s390,rng=objrng0,id=rng0

3
tests/qemuxml2argvdata/qemuxml2argv-s390-usb-none.args
View File

@ -8,4 +8,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \ -device virtio-blk-s390,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-chardev pty,id=charconsole0 \ -chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \ -device virtconsole,chardev=charconsole0,id=console0 \
-object rng-random,id=rng0,filename=/dev/hwrng -device virtio-rng-s390,rng=rng0 -object rng-random,id=objrng0,filename=/dev/hwrng \
-device virtio-rng-s390,rng=objrng0,id=rng0

4
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args
View File

@ -10,5 +10,5 @@ id=virtio-disk0,bootindex=1 \
-chardev pty,id=charconsole0 \ -chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \ -device virtconsole,chardev=charconsole0,id=console0 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \ -device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
-object rng-random,id=rng0,filename=/dev/hwrng \ -object rng-random,id=objrng0,filename=/dev/hwrng \
-device virtio-rng-ccw,rng=rng0,devno=fe.0.0002 -device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0002

4
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args
View File

@ -3,5 +3,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-S -M pc -m 214 -smp 1 -nographic -nodefaults \ -S -M pc -m 214 -smp 1 -nographic -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-object rng-random,id=rng0,filename=/dev/random \ -object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7

4
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args
View File

@ -4,5 +4,5 @@ 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 \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-chardev socket,id=charrng0,host=1.2.3.4,port=1234 \ -chardev socket,id=charrng0,host=1.2.3.4,port=1234 \
-object rng-egd,chardev=charrng0,id=rng0 \ -object rng-egd,chardev=charrng0,id=objrng0 \
-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x4 -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x4

8
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args
View File

@ -3,8 +3,8 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-M pc -m 214 -smp 1 -nographic -nodefaults \ -M pc -m 214 -smp 1 -nographic -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-object rng-random,id=rng0,filename=/dev/random \ -object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=rng0,bus=pci.0,addr=0x7 \ -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
-chardev socket,id=charrng1,host=1.2.3.4,port=1234 \ -chardev socket,id=charrng1,host=1.2.3.4,port=1234 \
-object rng-egd,chardev=charrng1,id=rng1 \ -object rng-egd,chardev=charrng1,id=objrng1 \
-device virtio-rng-pci,rng=rng1,bus=pci.0,addr=0x4 -device virtio-rng-pci,rng=objrng1,id=rng1,bus=pci.0,addr=0x4

4
tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args
View File

@ -3,5 +3,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \
-S -M pc -m 214 -smp 1 -nographic -nodefaults \ -S -M pc -m 214 -smp 1 -nographic -nodefaults \
-monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-object rng-random,id=rng0,filename=/dev/hwrng \ -object rng-random,id=objrng0,filename=/dev/hwrng \
-device virtio-rng-pci,rng=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x4 -device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x4