mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-30 18:03:32 +00:00
97dddef48c
Commit54fa1b44af("conf: Add loadparm boot option for a boot device") added the ability to specify a loadparm parameter on a <boot/> tag, while commit29ba41c2d4("qemu: Add loadparm to qemu command line string") added that value to the QEMU "-machine" command line parameters. Unfortunately, the latter commit only looked at disks and network devices for boot information, even though anything with VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT could potentially have this tag. In practice, a <hostdev> tag pointing to a passthrough (SCSI or DASD) disk device can be used in this way, which means the loadparm is accepted, but not given to QEMU. Correct this, and add some XML/argv tests. Signed-off-by: Eric Farman <farman@linux.ibm.com> Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
34 lines
1.1 KiB
XML
34 lines
1.1 KiB
XML
<domain type='qemu'>
|
|
<name>QEMUGuest1</name>
|
|
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
|
|
<memory unit='KiB'>524288</memory>
|
|
<currentMemory unit='KiB'>524288</currentMemory>
|
|
<vcpu placement='static'>2</vcpu>
|
|
<os>
|
|
<type arch='s390x' machine='s390-ccw-virtio'>hvm</type>
|
|
</os>
|
|
<cpu mode='custom' match='exact' check='none'>
|
|
<model fallback='forbid'>qemu</model>
|
|
</cpu>
|
|
<clock offset='utc'/>
|
|
<on_poweroff>destroy</on_poweroff>
|
|
<on_reboot>restart</on_reboot>
|
|
<on_crash>destroy</on_crash>
|
|
<devices>
|
|
<emulator>/usr/bin/qemu-system-s390x</emulator>
|
|
<controller type='pci' index='0' model='pci-root'/>
|
|
<audio id='1' type='none'/>
|
|
<hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'>
|
|
<source>
|
|
<address uuid='90c6c135-ad44-41d0-b1b7-bae47de48627'/>
|
|
</source>
|
|
<boot order='1' loadparm='2'/>
|
|
<address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
|
|
</hostdev>
|
|
<memballoon model='virtio'>
|
|
<address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
|
|
</memballoon>
|
|
<panic model='s390'/>
|
|
</devices>
|
|
</domain>
|