[for-6.2,2/8] monitor: Use accel_find("kvm") instead of kvm_available()

Message ID 20210730105947.28215-3-peter.maydell@linaro.org
State Superseded
Headers show
Series
  • softmmu: Clean up arch_init.c
Related show

Commit Message

Peter Maydell July 30, 2021, 10:59 a.m.
The kvm_available() function reports whether KVM support was
compiled into the QEMU binary; it returns the value of the
CONFIG_KVM define.

The only place in the codebase where we use this function is
in qmp_query_kvm(). Now that accelerators are based on QOM
classes we can instead use accel_find("kvm") and remove the
kvm_available() function.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 include/sysemu/arch_init.h | 2 --
 monitor/qmp-cmds.c         | 2 +-
 softmmu/arch_init.c        | 9 ---------
 3 files changed, 1 insertion(+), 12 deletions(-)

-- 
2.20.1

Comments

Richard Henderson July 30, 2021, 6:41 p.m. | #1
On 7/30/21 12:59 AM, Peter Maydell wrote:
> The kvm_available() function reports whether KVM support was

> compiled into the QEMU binary; it returns the value of the

> CONFIG_KVM define.

> 

> The only place in the codebase where we use this function is

> in qmp_query_kvm(). Now that accelerators are based on QOM

> classes we can instead use accel_find("kvm") and remove the

> kvm_available() function.

> 

> Signed-off-by: Peter Maydell<peter.maydell@linaro.org>

> ---

>   include/sysemu/arch_init.h | 2 --

>   monitor/qmp-cmds.c         | 2 +-

>   softmmu/arch_init.c        | 9 ---------

>   3 files changed, 1 insertion(+), 12 deletions(-)


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

Patch

diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
index 7acfc62418f..57caad1c675 100644
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -29,8 +29,6 @@  enum {
 
 extern const uint32_t arch_type;
 
-int kvm_available(void);
-
 /* default virtio transport per architecture */
 #define QEMU_ARCH_VIRTIO_PCI (QEMU_ARCH_ALPHA | QEMU_ARCH_ARM | \
                               QEMU_ARCH_HPPA | QEMU_ARCH_I386 | \
diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c
index f7d64a64577..9ddb9352e65 100644
--- a/monitor/qmp-cmds.c
+++ b/monitor/qmp-cmds.c
@@ -58,7 +58,7 @@  KvmInfo *qmp_query_kvm(Error **errp)
     KvmInfo *info = g_malloc0(sizeof(*info));
 
     info->enabled = kvm_enabled();
-    info->present = kvm_available();
+    info->present = accel_find("kvm");
 
     return info;
 }
diff --git a/softmmu/arch_init.c b/softmmu/arch_init.c
index 3f4d7c1b1cd..9011af74e4a 100644
--- a/softmmu/arch_init.c
+++ b/softmmu/arch_init.c
@@ -87,12 +87,3 @@  int graphic_depth = 32;
 #endif
 
 const uint32_t arch_type = QEMU_ARCH;
-
-int kvm_available(void)
-{
-#ifdef CONFIG_KVM
-    return 1;
-#else
-    return 0;
-#endif
-}