mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-21 11:13:30 +00:00
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.
This commit is contained in:
parent
7d376cbce3
commit
34820bbf06
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=186522
@ -126,6 +126,14 @@ SYSCTL_PROC(_kern, OID_AUTO, vm_guest, CTLFLAG_RD | CTLTYPE_STRING,
|
||||
*/
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user