External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-27 19:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Adjust tests for encrypted storage

Browse Source 
Make them work again...  The xml2xml had been working, but the xml2argv
were not working. Making the xml2argv work required a few adjustments to
the xml to update to more recent times.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2016-06-06 08:57:38 -04:00
parent 35f6abef6b
commit f06e45d578
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args
View File

@ -1,28 +1,24 @@
LC_ALL=C \ LC_ALL=C \
PATH=/sbin:/usr/sbin:/bin:/usr/bin \ PATH=/bin \
HOME=/root \ HOME=/home/test \
USER=root \ USER=test \
LOGNAME=root \ LOGNAME=test \
QEMU_AUDIO_DRV=none \
/usr/bin/qemu \ /usr/bin/qemu \
-name encryptdisk \ -name encryptdisk \
-S \ -S \
-M pc-0.13 \ -M pc \
-m 1024 \ -m 1024 \
-smp 1,sockets=1,cores=1,threads=1 \ -smp 1 \
-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \ -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-nographic \ -nographic \
-nodefconfig \
-nodefaults \ -nodefaults \
-chardev socket,id=monitor,path=//var/lib/libvirt/qemu/encryptdisk.monitor,\ -monitor unix:/tmp/lib/domain--1-encryptdisk/monitor.sock,server,nowait \
server,nowait \
-mon chardev=monitor,mode=readline \
-rtc base=utc \
-no-acpi \ -no-acpi \
-boot c \ -boot c \
-usb \ -usb \
-drive file=/storage/guest_disks/encryptdisk,format=raw,if=none,\ -drive file=/storage/guest_disks/encryptdisk,format=qcow2,if=none,\
id=drive-virtio-disk0,\,boot=on \ id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\ -device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,\
id=virtio-disk0 \ id=virtio-disk0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

4
tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml
View File

@ -1,11 +1,11 @@
<domain type='kvm'> <domain type='qemu'>
<name>encryptdisk</name> <name>encryptdisk</name>
<uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid> <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid>
<memory unit='KiB'>1048576</memory> <memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>524288</currentMemory> <currentMemory unit='KiB'>524288</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='i686' machine='pc-0.13'>hvm</type> <type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>

2
tests/qemuxml2argvtest.c
View File

@ -1339,6 +1339,8 @@ mymain(void)
DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM); DO_TEST("cpu-Haswell-noTSX", QEMU_CAPS_KVM);
driver.caps->host.cpu = cpuDefault; driver.caps->host.cpu = cpuDefault;
DO_TEST("encrypted-disk", NONE);
DO_TEST("memtune", NONE); DO_TEST("memtune", NONE);
DO_TEST("memtune-unlimited", NONE); DO_TEST("memtune-unlimited", NONE);
DO_TEST("blkiotune", NONE); DO_TEST("blkiotune", NONE);

4
tests/qemuxml2xmloutdata/qemuxml2xmlout-encrypted-disk.xml
View File

@ -1,11 +1,11 @@
<domain type='kvm'> <domain type='qemu'>
<name>encryptdisk</name> <name>encryptdisk</name>
<uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid> <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid>
<memory unit='KiB'>1048576</memory> <memory unit='KiB'>1048576</memory>
<currentMemory unit='KiB'>524288</currentMemory> <currentMemory unit='KiB'>524288</currentMemory>
<vcpu placement='static'>1</vcpu> <vcpu placement='static'>1</vcpu>
<os> <os>
<type arch='i686' machine='pc-0.13'>hvm</type> <type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/> <boot dev='hd'/>
</os> </os>
<clock offset='utc'/> <clock offset='utc'/>