diff --git a/sys/dev/smbios/smbios_subr.c b/sys/dev/smbios/smbios_subr.c
--- a/sys/dev/smbios/smbios_subr.c
+++ b/sys/dev/smbios/smbios_subr.c
@@ -69,6 +69,14 @@
 	char *p;
 	int i;
 
+	/*
+	 * Some platforms, e.g., amd64, have other ways of detecting what kind
+	 * of hypervisor we may be running under.  Make sure we don't clobber a
+	 * more specific vm_guest that's been previously detected.
+	 */
+	if (vm_guest != VM_GUEST_NO && vm_guest != VM_GUEST_VM)
+		return;
+
 	/*
 	 * XXX: Some of these entries may not be needed since they were
 	 * added to FreeBSD before the checks above.