[libvirt] [PATCH 4/5] virt-aa-helper-test: Fix failure due to the new disk format probing option

Commit 68719c4bddb85fbcc931a5b7d99ac7c8a0af09b0 added the disk format probing option. This makes virt-aa-helper-test fail because the domain config didn't specifiy the disk format and it didn't pass '-p 1' to virt-aa-helper to allow disk format probing. Specify the disk format in the domain config. Pass the '-p 1' option to virt-aa-helper for the test case with two disks. This way this test also covers this new option. --- tests/virt-aa-helper-test | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/tests/virt-aa-helper-test b/tests/virt-aa-helper-test index ada89f4..6c97aaf 100755 --- a/tests/virt-aa-helper-test +++ b/tests/virt-aa-helper-test @@ -76,6 +76,7 @@ cat > "$template_xml" <<EOM <devices> <emulator>/usr/bin/kvm</emulator> <disk type='file' device='disk'> + <driver name='qemu' type='raw'/> <source file='###DISK###'/> <target dev='hda' bus='ide'/> </disk> @@ -195,7 +196,7 @@ cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | testme "0" "create (ppc)" "-c -u $valid_uuid" "$test_xml" cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###,$disk1,g" | sed "s,</disk>,</disk><disk type='file' device='disk'><source file='$disk2'/><target dev='hdb' bus='ide'/></disk>,g" > "$test_xml" -testme "0" "create multiple disks" "-c -u $valid_uuid" "$test_xml" +testme "0" "create multiple disks" "-c -u $valid_uuid -p 1" "$test_xml" cat "$template_xml" | sed "s,###UUID###,$uuid,g" | sed "s,###DISK###',${disk1}'/><readonly,g" > "$test_xml" testme "0" "create (readonly)" "-c -u $valid_uuid" "$test_xml" -- 1.7.0.4