rpms/libvirt
7
0
Fork 1
Code Issues Pull Requests Releases Activity

fix regression for default input bus in libvirt >= 9.3

Browse Source 
Signed-off-by: Jonathan Wright <jonathan@almalinux.org>
This commit is contained in:
Jonathan Wright 2024-01-03 12:48:37 -06:00
parent b45924dfdc
commit 8c598a033f
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
SOURCES/libvirt-regression-input-default-bus.patch Normal file
View File

@ -0,0 +1,31 @@
From c9056e682a8a67dc29e39eb01392fcf8ee978c31 Mon Sep 17 00:00:00 2001
From: Jonathan Wright <jonathan@almalinux.org>
Date: Wed, 3 Jan 2024 09:26:59 -0600
Subject: [PATCH] conf: Restore setting default bus for input devices
Prior to v9.3.0-rc1~30 we used to set default bus for <input/>
devices, during XML parsing. In the commit this code was moved to
a post parse callback. But somehow the line that sets the bus in
one specific case disappeared. Bring it back.
Resolves: https://gitlab.com/libvirt/libvirt/-/issues/577
Fixes: c4bc4d3b82fbe22e03c986ca896090f481df5c10
Signed-off-by: Jonathan Wright <jonathan@almalinux.org>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---
src/conf/domain_postparse.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c
index e79913b73f..ee27023f3e 100644
--- a/src/conf/domain_postparse.c
+++ b/src/conf/domain_postparse.c
@@ -657,6 +657,7 @@ virDomainInputDefPostParse(virDomainInputDef *input,
if ((input->type == VIR_DOMAIN_INPUT_TYPE_MOUSE ||
input->type == VIR_DOMAIN_INPUT_TYPE_KBD) &&
(ARCH_IS_X86(def->os.arch) || def->os.arch == VIR_ARCH_NONE)) {
+ input->bus = VIR_DOMAIN_INPUT_BUS_PS2;
} else if (ARCH_IS_S390(def->os.arch) ||
input->type == VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH) {
input->bus = VIR_DOMAIN_INPUT_BUS_VIRTIO;
--

12
SPECS/libvirt.spec
View File

@ -229,7 +229,7 @@
Summary: Library providing a simple virtualization API
Name: libvirt
Version: 9.5.0
Release: 7%{?dist}%{?extra_release}.alma.1
Release: 7%{?dist}%{?extra_release}.alma.2
License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
URL: https://libvirt.org/
@ -293,6 +293,10 @@ Patch42: libvirt-qemu-turn-two-multiline-log-messages-into-single-line.patch
# https://github.com/libvirt/libvirt/commit/bbfcf18f504b0eb165c0bbfe2f34b4e20d11c355.patch
Patch43: libvirt-docs-update-description-of-virsh-nodedev-detach.patch
# https://gitlab.com/libvirt/libvirt/-/issues/577
# https://gitlab.com/libvirt/libvirt/-/commit/c9056e682a8a67dc29e39eb01392fcf8ee978c31
Patch44: libvirt-regression-input-default-bus.patch
Requires: libvirt-daemon = %{version}-%{release}
Requires: libvirt-daemon-config-network = %{version}-%{release}
Requires: libvirt-daemon-config-nwfilter = %{version}-%{release}
@ -2538,7 +2542,11 @@ exit 0
%endif
%changelog
* Thu Sep 05 2023 Eduard Abdullin <eabdullin@almalinux.org> - 9.5.0-7.alma.1
* Wed Jan 03 2024 Jonathan Wright <jonathan@almalinux.org> - 9.5.0-7.alma.2
- conf: fix regression for default input bus
- rpm: fix 9.5.0-7.alma.1 changelog date
* Thu Oct 05 2023 Eduard Abdullin <eabdullin@almalinux.org> - 9.5.0-7.alma.1
- docs: update description of virsh nodedev-detach --driver option
- qemu: turn two multiline log messages into single line
- util: add stub driver name to virPCIDevice object