|
 |
c401cc |
From 8486a89ab5ef901bb7f287d981de15d528452944 Mon Sep 17 00:00:00 2001
|
|
|
c401cc |
Message-Id: <8486a89ab5ef901bb7f287d981de15d528452944.1386348947.git.jdenemar@redhat.com>
|
|
|
c401cc |
From: Laine Stump <laine@laine.org>
|
|
|
c401cc |
Date: Tue, 3 Dec 2013 07:45:07 -0700
|
|
|
c401cc |
Subject: [PATCH] tests: add forgotten boot-strict test files
|
|
|
c401cc |
|
|
|
c401cc |
https://bugzilla.redhat.com/show_bug.cgi?id=1037593
|
|
|
c401cc |
|
|
|
c401cc |
These *should* have been included in an earlier ("qemu: add
|
|
|
c401cc |
"-boot strict" to commandline whenever possible")
|
|
|
c401cc |
|
|
|
c401cc |
(cherry picked from commit 9f6f2fa467e57f41e60835e7e94fd2487c9b0e5e)
|
|
|
c401cc |
|
|
|
c401cc |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
c401cc |
---
|
|
|
c401cc |
.../qemuxml2argvdata/qemuxml2argv-boot-strict.args | 36 ++++++++++++
|
|
|
c401cc |
.../qemuxml2argvdata/qemuxml2argv-boot-strict.xml | 66 ++++++++++++++++++++++
|
|
|
c401cc |
2 files changed, 102 insertions(+)
|
|
|
c401cc |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
|
|
|
c401cc |
create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml
|
|
|
c401cc |
|
|
|
c401cc |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
|
|
|
c401cc |
new file mode 100644
|
|
|
c401cc |
index 0000000..8dc7e30
|
|
|
c401cc |
--- /dev/null
|
|
|
c401cc |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args
|
|
|
c401cc |
@@ -0,0 +1,36 @@
|
|
|
c401cc |
+LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \
|
|
|
c401cc |
+/usr/bin/qemu \
|
|
|
c401cc |
+-S \
|
|
|
c401cc |
+-M pc \
|
|
|
c401cc |
+-m 214 \
|
|
|
c401cc |
+-smp 1 \
|
|
|
c401cc |
+-nographic \
|
|
|
c401cc |
+-nodefaults \
|
|
|
c401cc |
+-monitor unix:/tmp/test-monitor,server,nowait \
|
|
|
c401cc |
+-no-acpi \
|
|
|
c401cc |
+-boot strict=on \
|
|
|
c401cc |
+-usb \
|
|
|
c401cc |
+-drive file=/tmp/vda.img,if=none,id=drive-virtio-disk0 \
|
|
|
c401cc |
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\
|
|
|
c401cc |
+id=virtio-disk0,bootindex=3 \
|
|
|
c401cc |
+-drive file=/tmp/vdb.img,if=none,id=drive-virtio-disk1 \
|
|
|
c401cc |
+-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,\
|
|
|
c401cc |
+id=virtio-disk1 \
|
|
|
c401cc |
+-drive file=/dev/HostVG/hda,if=none,id=drive-ide0-0-0 \
|
|
|
c401cc |
+-device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
|
|
|
c401cc |
+-drive file=/dev/HostVG/hdb,if=none,id=drive-ide0-0-1 \
|
|
|
c401cc |
+-device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
|
|
|
c401cc |
+-drive file=/dev/HostVG/hdc,if=none,media=cdrom,id=drive-ide0-1-0 \
|
|
|
c401cc |
+-device ide-drive,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,\
|
|
|
c401cc |
+bootindex=1 \
|
|
|
c401cc |
+-drive file=/dev/fd0,if=none,id=drive-fdc0-0-0 \
|
|
|
c401cc |
+-global isa-fdc.driveA=drive-fdc0-0-0 \
|
|
|
c401cc |
+-global isa-fdc.bootindexA=4 \
|
|
|
c401cc |
+-drive file=/dev/fd1,if=none,id=drive-fdc0-0-1 \
|
|
|
c401cc |
+-global isa-fdc.driveB=drive-fdc0-0-1 \
|
|
|
c401cc |
+-device virtio-net-pci,vlan=0,id=net0,mac=00:11:22:33:44:11,bus=pci.0,\
|
|
|
c401cc |
+addr=0x3,bootindex=2 \
|
|
|
c401cc |
+-net user,vlan=0,name=hostnet0 \
|
|
|
c401cc |
+-device virtio-net-pci,vlan=1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,\
|
|
|
c401cc |
+addr=0x4 \
|
|
|
c401cc |
+-net user,vlan=1,name=hostnet1
|
|
|
c401cc |
diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml
|
|
|
c401cc |
new file mode 100644
|
|
|
c401cc |
index 0000000..b20013b
|
|
|
c401cc |
--- /dev/null
|
|
|
c401cc |
+++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-strict.xml
|
|
|
c401cc |
@@ -0,0 +1,66 @@
|
|
|
c401cc |
+<domain type='qemu'>
|
|
|
c401cc |
+ <name>QEMUGuest1</name>
|
|
|
c401cc |
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
|
c401cc |
+ <memory unit='KiB'>219100</memory>
|
|
|
c401cc |
+ <currentMemory unit='KiB'>219100</currentMemory>
|
|
|
c401cc |
+ <vcpu placement='static'>1</vcpu>
|
|
|
c401cc |
+ <os>
|
|
|
c401cc |
+ <type arch='i686' machine='pc'>hvm</type>
|
|
|
c401cc |
+ <boot dev='cdrom'/>
|
|
|
c401cc |
+ <boot dev='network'/>
|
|
|
c401cc |
+ <boot dev='hd'/>
|
|
|
c401cc |
+ <boot dev='fd'/>
|
|
|
c401cc |
+ </os>
|
|
|
c401cc |
+ <clock offset='utc'/>
|
|
|
c401cc |
+ <on_poweroff>destroy</on_poweroff>
|
|
|
c401cc |
+ <on_reboot>restart</on_reboot>
|
|
|
c401cc |
+ <on_crash>destroy</on_crash>
|
|
|
c401cc |
+ <devices>
|
|
|
c401cc |
+ <emulator>/usr/bin/qemu</emulator>
|
|
|
c401cc |
+ <disk type='file' device='disk'>
|
|
|
c401cc |
+ <source file='/tmp/vdb.img'/>
|
|
|
c401cc |
+ <target dev='vdb' bus='virtio'/>
|
|
|
c401cc |
+ </disk>
|
|
|
c401cc |
+ <disk type='block' device='disk'>
|
|
|
c401cc |
+ <source dev='/dev/HostVG/hdb'/>
|
|
|
c401cc |
+ <target dev='hdb' bus='ide'/>
|
|
|
c401cc |
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
|
|
c401cc |
+ </disk>
|
|
|
c401cc |
+ <disk type='block' device='disk'>
|
|
|
c401cc |
+ <source dev='/dev/HostVG/hda'/>
|
|
|
c401cc |
+ <target dev='hda' bus='ide'/>
|
|
|
c401cc |
+ <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
c401cc |
+ </disk>
|
|
|
c401cc |
+ <disk type='file' device='disk'>
|
|
|
c401cc |
+ <source file='/tmp/vda.img'/>
|
|
|
c401cc |
+ <target dev='vda' bus='virtio'/>
|
|
|
c401cc |
+ </disk>
|
|
|
c401cc |
+ <disk type='block' device='cdrom'>
|
|
|
c401cc |
+ <source dev='/dev/HostVG/hdc'/>
|
|
|
c401cc |
+ <target dev='hdc' bus='ide'/>
|
|
|
c401cc |
+ <address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
|
|
c401cc |
+ </disk>
|
|
|
c401cc |
+ <disk type='block' device='floppy'>
|
|
|
c401cc |
+ <source dev='/dev/fd1'/>
|
|
|
c401cc |
+ <target dev='fdb' bus='fdc'/>
|
|
|
c401cc |
+ <address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
|
|
c401cc |
+ </disk>
|
|
|
c401cc |
+ <disk type='block' device='floppy'>
|
|
|
c401cc |
+ <source dev='/dev/fd0'/>
|
|
|
c401cc |
+ <target dev='fda' bus='fdc'/>
|
|
|
c401cc |
+ <address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
|
|
c401cc |
+ </disk>
|
|
|
c401cc |
+ <controller type='usb' index='0'/>
|
|
|
c401cc |
+ <controller type='fdc' index='0'/>
|
|
|
c401cc |
+ <controller type='ide' index='0'/>
|
|
|
c401cc |
+ <interface type='user'>
|
|
|
c401cc |
+ <mac address='00:11:22:33:44:11'/>
|
|
|
c401cc |
+ <model type='virtio'/>
|
|
|
c401cc |
+ </interface>
|
|
|
c401cc |
+ <interface type='user'>
|
|
|
c401cc |
+ <mac address='00:11:22:33:44:22'/>
|
|
|
c401cc |
+ <model type='virtio'/>
|
|
|
c401cc |
+ </interface>
|
|
|
c401cc |
+ <memballoon model='none'/>
|
|
|
c401cc |
+ </devices>
|
|
|
c401cc |
+</domain>
|
|
|
c401cc |
--
|
|
|
c401cc |
1.8.4.5
|
|
|
c401cc |
|