[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.2 2/8] monitor: Use accel_find("kvm") instead of kvm_availa
From: |
Peter Maydell |
Subject: |
[PATCH for-6.2 2/8] monitor: Use accel_find("kvm") instead of kvm_available() |
Date: |
Fri, 30 Jul 2021 11:59:41 +0100 |
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(-)
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
-}
--
2.20.1
- [PATCH for-6.2 0/8] softmmu: Clean up arch_init.c, Peter Maydell, 2021/07/30
- [PATCH for-6.2 1/8] softmmu: Use accel_find("xen") instead of xen_available(), Peter Maydell, 2021/07/30
- [PATCH for-6.2 3/8] softmmu/arch_init.c: Trim down include list, Peter Maydell, 2021/07/30
- [PATCH for-6.2 2/8] monitor: Use accel_find("kvm") instead of kvm_available(),
Peter Maydell <=
- [PATCH for-6.2 5/8] arch_init.h: Add QEMU_ARCH_HEXAGON, Peter Maydell, 2021/07/30
- [PATCH for-6.2 4/8] meson.build: Define QEMU_ARCH in config-target.h, Peter Maydell, 2021/07/30
- [PATCH for-6.2 6/8] arch_init.h: Move QEMU_ARCH_VIRTIO_* to qdev-monitor.c, Peter Maydell, 2021/07/30