mirror of https://gitee.com/openkylin/libvirt.git
tests: qemuxml2argv: Fix and enable 'disk-transient' case
We didn't actually use this file. Change the disk type to 'file' so that it works in qemu and add pre and post-blockdev invocations. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com> Tested-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
596c659b4e
commit
b74fabe9f6
|
@ -0,0 +1 @@
|
|||
unsupported configuration: transient disk not supported by this QEMU binary (hda)
|
|
@ -0,0 +1,42 @@
|
|||
LC_ALL=C \
|
||||
PATH=/bin \
|
||||
HOME=/tmp/lib/domain--1-QEMUGuest1 \
|
||||
USER=test \
|
||||
LOGNAME=test \
|
||||
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
|
||||
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
|
||||
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
|
||||
QEMU_AUDIO_DRV=none \
|
||||
/usr/bin/qemu-system-i386 \
|
||||
-name guest=QEMUGuest1,debug-threads=on \
|
||||
-S \
|
||||
-object secret,id=masterKey0,format=raw,\
|
||||
file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
|
||||
-machine pc,accel=tcg,usb=off,dump-guest-core=off \
|
||||
-cpu qemu64 \
|
||||
-m 214 \
|
||||
-overcommit mem-lock=off \
|
||||
-smp 1,sockets=1,cores=1,threads=1 \
|
||||
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
|
||||
-display none \
|
||||
-no-user-config \
|
||||
-nodefaults \
|
||||
-chardev socket,id=charmonitor,fd=1729,server,nowait \
|
||||
-mon chardev=charmonitor,id=monitor,mode=control \
|
||||
-rtc base=utc \
|
||||
-no-shutdown \
|
||||
-no-acpi \
|
||||
-boot strict=on \
|
||||
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
|
||||
-blockdev '{"driver":"file","filename":"/tmp/QEMUGuest1.img",\
|
||||
"node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},\
|
||||
"auto-read-only":true,"discard":"unmap"}' \
|
||||
-blockdev '{"node-name":"libvirt-1-format","read-only":false,\
|
||||
"cache":{"direct":true,"no-flush":false},"driver":"qcow2",\
|
||||
"file":"libvirt-1-storage"}' \
|
||||
-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,\
|
||||
write-cache=on \
|
||||
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
|
||||
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
|
||||
resourcecontrol=deny \
|
||||
-msg timestamp=on
|
|
@ -14,9 +14,9 @@
|
|||
<on_crash>destroy</on_crash>
|
||||
<devices>
|
||||
<emulator>/usr/bin/qemu-system-i386</emulator>
|
||||
<disk type='block' device='disk'>
|
||||
<disk type='file' device='disk'>
|
||||
<driver name='qemu' type='qcow2' cache='none'/>
|
||||
<source dev='/dev/HostVG/QEMUGuest1'/>
|
||||
<source file='/tmp/QEMUGuest1.img'/>
|
||||
<target dev='hda' bus='ide'/>
|
||||
<transient/>
|
||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||
|
|
|
@ -1175,6 +1175,8 @@ mymain(void)
|
|||
DO_TEST_CAPS_VER("disk-cache", "2.7.0");
|
||||
DO_TEST_CAPS_VER("disk-cache", "2.12.0");
|
||||
DO_TEST_CAPS_LATEST("disk-cache");
|
||||
DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64", "4.1.0");
|
||||
DO_TEST_CAPS_LATEST("disk-transient");
|
||||
DO_TEST("disk-network-nbd", NONE);
|
||||
DO_TEST_CAPS_VER("disk-network-nbd", "2.12.0");
|
||||
DO_TEST_CAPS_LATEST("disk-network-nbd");
|
||||
|
|
Loading…
Reference in New Issue