File fb7016a7-qemu-dissolve-virQEMUCapsFindBinaryForArch.patch of Package libvirt.26629
commit fb7016a704b2f74a8559ab89bf994ddb86fba74e
Author: Andrea Bolognani <abologna@redhat.com>
Date: Thu Mar 31 11:01:24 2022 +0200
qemu: Dissolve virQEMUCapsFindBinaryForArch()
With the recent changes, virQEMUCapsGetDefaultEmulator() has
become a trivial wrapper around this function, as well as its
only caller. Clean up the situation by merging the two.
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Tested-by: Jim Fehlig <jfehlig@suse.com>
Index: libvirt-8.0.0/src/qemu/qemu_capabilities.c
===================================================================
--- libvirt-8.0.0.orig/src/qemu/qemu_capabilities.c
+++ libvirt-8.0.0/src/qemu/qemu_capabilities.c
@@ -873,9 +873,9 @@ virQEMUCapsFindBinary(const char *format
return ret;
}
-static char *
-virQEMUCapsFindBinaryForArch(virArch hostarch,
- virArch guestarch)
+char *
+virQEMUCapsGetDefaultEmulator(virArch hostarch,
+ virArch guestarch)
{
char *binary;
const char *archstr;
@@ -914,14 +914,6 @@ virQEMUCapsFindBinaryForArch(virArch hos
}
-char *
-virQEMUCapsGetDefaultEmulator(virArch hostarch,
- virArch guestarch)
-{
- return virQEMUCapsFindBinaryForArch(hostarch, guestarch);
-}
-
-
static int
virQEMUCapsInitGuest(virCaps *caps,
virFileCache *cache,