From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 31 Mar 2022 09:01:24 +0000 (+0200)
Subject: qemu: Dissolve virQEMUCapsFindBinaryForArch()
X-Git-Tag: v8.3.0-rc1~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb7016a704b2f74a8559ab89bf994ddb86fba74e;p=thirdparty%2Flibvirt.git

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>
---

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 41e9a3a3f5..25d029d0cc 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -915,9 +915,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;
@@ -956,14 +956,6 @@ virQEMUCapsFindBinaryForArch(virArch hostarch,
 }
 
 
-char *
-virQEMUCapsGetDefaultEmulator(virArch hostarch,
-                              virArch guestarch)
-{
-    return virQEMUCapsFindBinaryForArch(hostarch, guestarch);
-}
-
-
 static int
 virQEMUCapsInitGuest(virCaps *caps,
                      virFileCache *cache,