Author: bz
Date: Sat Dec 27 17:19:16 2008
New Revision: 186522
URL: http://svn.freebsd.org/changeset/base/186522
Log:
Hide detect_virtual() along with the accompanying string
arrays under #ifndef XEN to make XEN config compile again.
In case of Xen vm_guest is hard coded.
Move the list for the vm_guest sysctl out of the restictive
bounds as the sysctl is there in either case.
Modified:
head/sys/kern/subr_param.c
Modified: head/sys/kern/subr_param.c
==============================================================================
--- head/sys/kern/subr_param.c Sat Dec 27 16:03:34 2008 (r186521)
+++ head/sys/kern/subr_param.c Sat Dec 27 17:19:16 2008 (r186522)
@@ -126,6 +126,14 @@ SYSCTL_PROC(_kern, OID_AUTO, vm_guest, C
*/
struct buf *swbuf;
+static const char *const vm_guest_sysctl_names[] = {
+ "none",
+ "generic",
+ "xen",
+ NULL
+};
+
+#ifndef XEN
static const char *const vm_bnames[] = {
"QEMU", /* QEMU */
"Plex86", /* Plex86 */
@@ -141,13 +149,6 @@ static const char *const vm_pnames[] = {
NULL
};
-static const char *const vm_guest_sysctl_names[] = {
- "none",
- "generic",
- "xen",
- NULL
-};
-
/*
* Detect known Virtual Machine hosts by inspecting the emulated BIOS.
@@ -178,6 +179,7 @@ detect_virtual(void)
}
return (VM_GUEST_NO);
}
+#endif
/*
* Boot time overrides that are not scaled against main memory
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
