PR#23: fix regression for default input bus in libvirt >= 9.3 - rpms/libvirt

jonathanspw • 3 months ago

dfeabf1

file added

+31

		`@@ -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;`
		`+ --`

libvirt.spec

file modified

+8 -1

		`@@ -229,7 +229,7 @@`
		`Summary: Library providing a simple virtualization API`
		`Name: libvirt`
		`Version: 9.7.0`
		`- Release: 1%{?dist}`
		`+ Release: 2%{?dist}`
		`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/`

		`@@ -238,6 +238,10 @@`
		`%endif`
		`Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz`

		`+ # Fix regression in default input bus`
		`+ # https://gitlab.com/libvirt/libvirt/-/issues/577`
		`+ Patch1: 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}`
		`@@ -2470,6 +2474,9 @@`


		`%changelog`
		`+ * Wed Jan 03 2024 Jonathan Wright <jonathan@almalinux.org> - 9.7.0-2`
		`+ - conf: fix regression for default input bus`
		`+`
		`* Fri Sep 1 2023 Daniel P. Berrangé <berrange@redhat.com> - 9.7.0-1`
		`- Update to version 9.7.0`