diff --git a/src/cpu/kvm/Kconfig b/src/cpu/kvm/Kconfig
index 2b76e94360..4e0ec0c287 100644
--- a/src/cpu/kvm/Kconfig
+++ b/src/cpu/kvm/Kconfig
@@ -23,11 +23,16 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+config HAVE_KVM
+    bool
+    default "$(HAVE_KVM)"
+
 config KVM_ISA
     string
     default "$(KVM_ISA)"
 
 config USE_KVM
-    depends on KVM_ISA != ""
+    depends on KVM_ISA != "" && HAVE_KVM
     bool "Enable hardware virtualized (KVM) CPU models"
     default y
diff --git a/src/cpu/kvm/SConsopts b/src/cpu/kvm/SConsopts
index 1363d60951..5024b1eba9 100644
--- a/src/cpu/kvm/SConsopts
+++ b/src/cpu/kvm/SConsopts
@@ -61,5 +61,8 @@ with gem5_scons.Configure(main) as conf:
             warning("perf_event headers lack support for the exclude_host "
                     "attribute. KVM instruction counts will be inaccurate.")
 
-if not main['CONF']['KVM_ISA']:
-    warning("Can not enable KVM, host seems to lack KVM support")
+def create_use_kvm_var():
+    if not (main['CONF']['HAVE_KVM'] and main['CONF']['KVM_ISA']):
+        warning("Cannot enable KVM, host seems to lack KVM support")
+
+AfterSConsopts(create_use_kvm_var)