[PATCH] Fix regression on default bus for keyboard/mouse from c4bc4d3b #577

Signed-off-by: Jonathan Wright <jonathan@almalinux.org> --- 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; -- 2.43.0

On 1/3/24 16:26, Jonathan Wright wrote:
Signed-off-by: Jonathan Wright <jonathan@almalinux.org> --- 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;
I've tweaked the commit message a bit (so that it's easy to understand what the commit is doing just by reading git log) and merged. Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Congratulations on your first libvirt contribution and bug analysis. Michal

Thank you! Having never done a patch via email with the git tools I failed to add a good commit message :) I appreciate the quick action on this one so I can start working on backports/patches into distros now! On Wed, Jan 3, 2024 at 10:23 AM Michal Prívozník <mprivozn@redhat.com> wrote:
On 1/3/24 16:26, Jonathan Wright wrote:
Signed-off-by: Jonathan Wright <jonathan@almalinux.org> --- 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;
I've tweaked the commit message a bit (so that it's easy to understand what the commit is doing just by reading git log) and merged.
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Congratulations on your first libvirt contribution and bug analysis.
Michal
-- Jonathan Wright AlmaLinux Foundation Mattermost: chat <https://chat.almalinux.org/almalinux/messages/@jonathan>
participants (2)
-
Jonathan Wright
-
Michal Prívozník