d666bf1e9d
- qemu: fix qemu command for pci hostdevs and ramfb='off' (RHEL-28808) Resolves: RHEL-28808
85 lines
4.0 KiB
Diff
85 lines
4.0 KiB
Diff
From 36089ebf38b3ffa68af41c7bb0b5d3d49c0c9b14 Mon Sep 17 00:00:00 2001
|
|
Message-ID: <36089ebf38b3ffa68af41c7bb0b5d3d49c0c9b14.1716796433.git.jdenemar@redhat.com>
|
|
From: Jonathon Jongsma <jjongsma@redhat.com>
|
|
Date: Thu, 16 May 2024 16:46:04 -0500
|
|
Subject: [PATCH] qemu: fix qemu command for pci hostdevs and ramfb='off'
|
|
|
|
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>
|
|
(cherry picked from commit 7c8e606b64c73ca56d7134cb16d01257f39c53ef)
|
|
|
|
https://issues.redhat.com/browse/RHEL-28808
|
|
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
---
|
|
src/qemu/qemu_command.c | 2 +-
|
|
.../hostdev-pci-display-ramfb.x86_64-latest.args | 1 +
|
|
.../hostdev-pci-display-ramfb.x86_64-latest.xml | 6 ++++++
|
|
tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml | 5 +++++
|
|
4 files changed, 13 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
index 8d4442c360..d614884fa4 100644
|
|
--- a/src/qemu/qemu_command.c
|
|
+++ b/src/qemu/qemu_command.c
|
|
@@ -4777,7 +4777,7 @@ qemuBuildPCIHostdevDevProps(const virDomainDef *def,
|
|
"p:bootindex", dev->info->effectiveBootIndex,
|
|
"S:failover_pair_id", failover_pair_id,
|
|
"S:display", qemuOnOffAuto(pcisrc->display),
|
|
- "B:ramfb", pcisrc->ramfb,
|
|
+ "T:ramfb", pcisrc->ramfb,
|
|
NULL) < 0)
|
|
return NULL;
|
|
|
|
diff --git a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
|
|
index 6a3bfbe6fb..e6e538ef1c 100644
|
|
--- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
|
|
+++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.args
|
|
@@ -29,5 +29,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest2/.config \
|
|
-audiodev '{"id":"audio1","driver":"none"}' \
|
|
-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","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 \
|
|
-msg timestamp=on
|
|
diff --git a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml
|
|
index 16e8a1dee2..18b9bfb5bf 100644
|
|
--- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml
|
|
+++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.x86_64-latest.xml
|
|
@@ -39,6 +39,12 @@
|
|
</source>
|
|
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
|
|
</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'/>
|
|
</devices>
|
|
</domain>
|
|
diff --git a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml
|
|
index 39c84da7e1..d263342b1d 100644
|
|
--- a/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml
|
|
+++ b/tests/qemuxmlconfdata/hostdev-pci-display-ramfb.xml
|
|
@@ -25,6 +25,11 @@
|
|
<address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
|
|
</source>
|
|
</hostdev>
|
|
+ <hostdev mode='subsystem' type='pci' display='off' ramfb='off'>
|
|
+ <source>
|
|
+ <address domain='0x0000' bus='0x06' slot='0x13' function='0x6'/>
|
|
+ </source>
|
|
+ </hostdev>
|
|
<video>
|
|
<model type='none'/>
|
|
</video>
|
|
--
|
|
2.45.1
|