From 846edc405ecefeaac0fe18e432c9951a45bb953d Mon Sep 17 00:00:00 2001 From: Dario Faggioli Date: Sat, 17 Feb 2024 10:04:37 +0100 Subject: [PATCH] [openSUSE][RPM] Install the VGA module "more often" (bsc#1219164) Depending on the VM configuration (both at the VM definition level and on the guest itself) a VGA console might be necessary, or weird lockup will occur. Since the VGA module package is smalle enough, add a dependency for it, from other display modules, to act as a workaround. While there, make more explicit and precise the dependencies between all the various modules, by specifying that they should all have the same version and release. References: bsc#1219164 Signed-off-by: Dario Faggioli --- rpm/qemu.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/rpm/qemu.spec b/rpm/qemu.spec index 18352d19cc..dcac590f6a 100644 --- a/rpm/qemu.spec +++ b/rpm/qemu.spec @@ -1103,7 +1103,7 @@ necessary for having SPICE working for your VMs. %package audio-spice Summary: Spice based audio support for QEMU Group: System/Emulators/PC -Requires: qemu-ui-spice-core +Requires: qemu-ui-spice-core = %{version}-%{release} %{qemu_module_conflicts} %description audio-spice @@ -1116,7 +1116,7 @@ This package contains a module for Spice based audio support for QEMU. %package chardev-spice Summary: Spice vmc and port chardev support for QEMU Group: System/Emulators/PC -Requires: qemu-ui-spice-core +Requires: qemu-ui-spice-core = %{version}-%{release} %{qemu_module_conflicts} %description chardev-spice @@ -1130,8 +1130,8 @@ This package contains a module for Spice chardev support for QEMU. %package ui-spice-app Summary: Spice UI support for QEMU Group: System/Emulators/PC -Requires: qemu-chardev-spice -Requires: qemu-ui-spice-core +Requires: qemu-chardev-spice = %{version}-%{release} +Requires: qemu-ui-spice-core = %{version}-%{release} %{qemu_module_conflicts} %description ui-spice-app @@ -1146,7 +1146,7 @@ Summary: Core Spice support for QEMU Group: System/Emulators/PC Requires: qemu-ui-opengl # This next Requires is only since virt-manager expects audio support -Requires: qemu-audio-spice +Requires: qemu-audio-spice = %{version}-%{release} %{qemu_module_conflicts} %description ui-spice-core @@ -1160,7 +1160,7 @@ This package contains a module with core Spice support for QEMU. %package hw-display-qxl Summary: QXL display support for QEMU Group: System/Emulators/PC -Requires: qemu-ui-spice-core +Requires: qemu-ui-spice-core = %{version}-%{release} %{qemu_module_conflicts} %description hw-display-qxl @@ -1519,6 +1519,12 @@ This package contains a module for baum braille chardev support for QEMU. %package hw-display-virtio-gpu Summary: Virtio GPU display support for QEMU Group: System/Emulators/PC +# Make sure that VGA is pretty much always there. Technically, this isn't +# really necessary (and/or, should be dealt with in other places) but it +# makes it easier to deal with strange situation where, e.g., GRUB is +# configured to work only with a graphical terminal (see bsc#1219164), +# and the hw-display-virtio-vga package is small enough, anyway. +Requires: qemu-hw-display-virtio-vga = %{version}-%{release} %{qemu_module_conflicts} %description hw-display-virtio-gpu @@ -1532,7 +1538,7 @@ This package contains a module for Virtio GPU display support for QEMU. %package hw-display-virtio-gpu-pci Summary: Virtio-gpu pci device for QEMU Group: System/Emulators/PC -Requires: qemu-hw-display-virtio-gpu +Requires: qemu-hw-display-virtio-gpu = %{version}-%{release} %{qemu_module_conflicts} %description hw-display-virtio-gpu-pci @@ -1561,7 +1567,7 @@ This package contains a module providing the virtio vga device for QEMU. %package hw-s390x-virtio-gpu-ccw Summary: S390x virtio-gpu ccw device for QEMU Group: System/Emulators/PC -Requires: qemu-hw-display-virtio-gpu +Requires: qemu-hw-display-virtio-gpu = %{version}-%{release} %{qemu_module_conflicts} %description hw-s390x-virtio-gpu-ccw