When running the tests under "qemu -accel kvm" on a Linux host,

isQEMU_TCG() should return false.  Fixes multiple test cases that were
failing with "Test case was expecting a failure but none were raised"
on that platform.
This commit is contained in:
gson 2021-12-15 09:19:28 +00:00
parent 3ed29d6469
commit 873071237c
1 changed files with 12 additions and 4 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: isqemu.h,v 1.5 2020/08/23 11:00:18 gson Exp $ */ /* $NetBSD: isqemu.h,v 1.6 2021/12/15 09:19:28 gson Exp $ */
/*- /*-
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -72,10 +72,18 @@ isQEMU_TCG(void) {
return false; return false;
err(EXIT_FAILURE, "sysctl"); err(EXIT_FAILURE, "sysctl");
} }
return strstr(name, "QEMU") != NULL; if (strstr(name, "QEMU") == NULL)
#else return false;
return false; if (sysctlbyname("machdep.hypervisor", name, &len, NULL, 0) == -1) {
if (errno == ENOENT)
return true;
err(EXIT_FAILURE, "sysctl");
}
if (strcmp(name, "KVM") == 0)
return false;
return true;
#endif #endif
return false;
} }
#ifdef TEST #ifdef TEST