External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: fix qemu command for pci hostdevs and ramfb='off'

Browse Source 
There was no test for this and we mistakenly used 'B' rather than 'T'
when constructing the json value for this parameter. Thus, a value of
'off' was VIR_TRISTATE_SWITCH_OFF=2, which was translated to a boolean
value of 'true'.

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
This commit is contained in:
Jonathon Jongsma 2024-05-16 16:46:04 -05:00
parent 615af05e06
commit 7c8e606b64
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_command.c
View File

@ -4798,7 +4798,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
"p:bootindex", dev->info->effectiveBootIndex, "p:bootindex", dev->info->effectiveBootIndex,
"S:failover_pair_id", failover_pair_id, "S:failover_pair_id", failover_pair_id,
"S:display", qemuOnOffAuto(pcisrc->display), "S:display", qemuOnOffAuto(pcisrc->display),
"B:ramfb", pcisrc->ramfb, "T:ramfb", pcisrc->ramfb,
NULL) < 0) NULL) < 0)
return NULL; return NULL;

1
tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
View File

@ -29,5 +29,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
-audiodev '{"id":"audio1","driver":"none"}' \ -audiodev '{"id":"audio1","driver":"none"}' \
-vnc 127.0.0.1:0,audiodev=audio1 \ -vnc 127.0.0.1:0,audiodev=audio1 \
-device '{"driver":"vfio-pci-nohotplug","host":"0000:06:12.5","id":"hostdev0","display":"on","ramfb":true,"bus":"pci.0","addr":"0x2"}' \ -device '{"driver":"vfio-pci-nohotplug","host":"0000:06:12.5","id":"hostdev0","display":"on","ramfb":true,"bus":"pci.0","addr":"0x2"}' \
-device '{"driver":"vfio-pci","host":"0000:06:13.6","id":"hostdev1","display":"off","ramfb":false,"bus":"pci.0","addr":"0x3"}' \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-msg timestamp=on -msg timestamp=on

6
tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml
View File

@ -39,6 +39,12 @@
</source> </source>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</hostdev> </hostdev>
<hostdev mode='subsystem' type='pci' managed='no' display='off' ramfb='off'>
<source>
<address domain='0x0000' bus='0x06' slot='0x13' function='0x6'/>
</source>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</hostdev>
<memballoon model='none'/> <memballoon model='none'/>
</devices> </devices>
</domain> </domain>

5
tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml
View File

@ -25,6 +25,11 @@
<address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/> <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
</source> </source>
</hostdev> </hostdev>
<hostdev mode='subsystem' type='pci' display='off' ramfb='off'>
<source>
<address domain='0x0000' bus='0x06' slot='0x13' function='0x6'/>
</source>
</hostdev>
<video> <video>
<model type='none'/> <model type='none'/>
</video> </video>