mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 06:05:27 +00:00
qemuxml2argvtest: Remove 'boot-strict' case
It's identical to 'boot-order'. Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
parent
4560736c9c
commit
b59b2319a6
@ -1,48 +0,0 @@
|
|||||||
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 \
|
|
||||||
-m 214 \
|
|
||||||
-realtime mlock=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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server=on,wait=off \
|
|
||||||
-mon chardev=charmonitor,id=monitor,mode=control \
|
|
||||||
-rtc base=utc \
|
|
||||||
-no-shutdown \
|
|
||||||
-no-acpi \
|
|
||||||
-boot strict=on \
|
|
||||||
-usb \
|
|
||||||
-drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
|
|
||||||
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
|
|
||||||
-drive file=/tmp/vdb.img,format=raw,if=none,id=drive-virtio-disk1 \
|
|
||||||
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk1,id=virtio-disk1 \
|
|
||||||
-drive file=/dev/HostVG/hda,format=raw,if=none,id=drive-ide0-0-0 \
|
|
||||||
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
|
||||||
-drive file=/dev/HostVG/hdb,format=raw,if=none,id=drive-ide0-0-1 \
|
|
||||||
-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
|
||||||
-drive file=/dev/HostVG/hdc,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
|
|
||||||
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
|
|
||||||
-drive file=/dev/fd0,format=raw,if=none,id=drive-fdc0-0-0 \
|
|
||||||
-drive file=/dev/fd1,format=raw,if=none,id=drive-fdc0-0-1 \
|
|
||||||
-global isa-fdc.driveA=drive-fdc0-0-0 \
|
|
||||||
-global isa-fdc.bootindexA=4 \
|
|
||||||
-global isa-fdc.driveB=drive-fdc0-0-1 \
|
|
||||||
-netdev user,id=hostnet0 \
|
|
||||||
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,addr=0x2,bootindex=2 \
|
|
||||||
-netdev user,id=hostnet1 \
|
|
||||||
-device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x3 \
|
|
||||||
-msg timestamp=on
|
|
@ -1,66 +0,0 @@
|
|||||||
<domain type='qemu'>
|
|
||||||
<name>QEMUGuest1</name>
|
|
||||||
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
||||||
<memory unit='KiB'>219100</memory>
|
|
||||||
<currentMemory unit='KiB'>219100</currentMemory>
|
|
||||||
<vcpu placement='static'>1</vcpu>
|
|
||||||
<os>
|
|
||||||
<type arch='i686' machine='pc'>hvm</type>
|
|
||||||
<boot dev='cdrom'/>
|
|
||||||
<boot dev='network'/>
|
|
||||||
<boot dev='hd'/>
|
|
||||||
<boot dev='fd'/>
|
|
||||||
</os>
|
|
||||||
<clock offset='utc'/>
|
|
||||||
<on_poweroff>destroy</on_poweroff>
|
|
||||||
<on_reboot>restart</on_reboot>
|
|
||||||
<on_crash>destroy</on_crash>
|
|
||||||
<devices>
|
|
||||||
<emulator>/usr/bin/qemu-system-i386</emulator>
|
|
||||||
<disk type='file' device='disk'>
|
|
||||||
<source file='/tmp/vdb.img'/>
|
|
||||||
<target dev='vdb' bus='virtio'/>
|
|
||||||
</disk>
|
|
||||||
<disk type='block' device='disk'>
|
|
||||||
<source dev='/dev/HostVG/hdb'/>
|
|
||||||
<target dev='hdb' bus='ide'/>
|
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
|
||||||
</disk>
|
|
||||||
<disk type='block' device='disk'>
|
|
||||||
<source dev='/dev/HostVG/hda'/>
|
|
||||||
<target dev='hda' bus='ide'/>
|
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
||||||
</disk>
|
|
||||||
<disk type='file' device='disk'>
|
|
||||||
<source file='/tmp/vda.img'/>
|
|
||||||
<target dev='vda' bus='virtio'/>
|
|
||||||
</disk>
|
|
||||||
<disk type='block' device='cdrom'>
|
|
||||||
<source dev='/dev/HostVG/hdc'/>
|
|
||||||
<target dev='hdc' bus='ide'/>
|
|
||||||
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
|
||||||
</disk>
|
|
||||||
<disk type='block' device='floppy'>
|
|
||||||
<source dev='/dev/fd1'/>
|
|
||||||
<target dev='fdb' bus='fdc'/>
|
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
|
||||||
</disk>
|
|
||||||
<disk type='block' device='floppy'>
|
|
||||||
<source dev='/dev/fd0'/>
|
|
||||||
<target dev='fda' bus='fdc'/>
|
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
||||||
</disk>
|
|
||||||
<controller type='usb' index='0'/>
|
|
||||||
<controller type='fdc' index='0'/>
|
|
||||||
<controller type='ide' index='0'/>
|
|
||||||
<interface type='user'>
|
|
||||||
<mac address='00:11:22:33:44:11'/>
|
|
||||||
<model type='virtio'/>
|
|
||||||
</interface>
|
|
||||||
<interface type='user'>
|
|
||||||
<mac address='00:11:22:33:44:22'/>
|
|
||||||
<model type='virtio'/>
|
|
||||||
</interface>
|
|
||||||
<memballoon model='none'/>
|
|
||||||
</devices>
|
|
||||||
</domain>
|
|
@ -1078,8 +1078,6 @@ mymain(void)
|
|||||||
QEMU_CAPS_VIRTIO_BLK_SCSI);
|
QEMU_CAPS_VIRTIO_BLK_SCSI);
|
||||||
DO_TEST("boot-complex",
|
DO_TEST("boot-complex",
|
||||||
QEMU_CAPS_VIRTIO_BLK_SCSI);
|
QEMU_CAPS_VIRTIO_BLK_SCSI);
|
||||||
DO_TEST("boot-strict",
|
|
||||||
QEMU_CAPS_VIRTIO_BLK_SCSI);
|
|
||||||
|
|
||||||
/* Simplest possible <audio>, all supported with ENV */
|
/* Simplest possible <audio>, all supported with ENV */
|
||||||
DO_TEST_NOCAPS("audio-none-minimal");
|
DO_TEST_NOCAPS("audio-none-minimal");
|
||||||
|
Loading…
Reference in New Issue
Block a user