From f44a0b7b28b4904f94c0bdc37ffe0696655264be Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 9 May 2014 15:37:52 +0200 Subject: [PATCH] --- sys/dev/hyperv/vmbus/hv_hv.c | 2 ++ sys/dev/xen/xenpci/xenpci.c | 1 + sys/x86/xen/hvm.c | 2 ++ 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/sys/dev/hyperv/vmbus/hv_hv.c b/sys/dev/hyperv/vmbus/hv_hv.c index 80a1f42..6edfd66 100644 --- a/sys/dev/hyperv/vmbus/hv_hv.c +++ b/sys/dev/hyperv/vmbus/hv_hv.c @@ -91,6 +91,8 @@ hv_vmbus_query_hypervisor_presence(void) u_int regs[4]; int hyper_v_detected = 0; + return (0); + /* * When Xen is detected and native Xen PV support is enabled, * ignore Xen's HyperV emulation. diff --git a/sys/dev/xen/xenpci/xenpci.c b/sys/dev/xen/xenpci/xenpci.c index dd2ad92..5261a1e 100644 --- a/sys/dev/xen/xenpci/xenpci.c +++ b/sys/dev/xen/xenpci/xenpci.c @@ -224,6 +224,7 @@ xenpci_deactivate_resource(device_t dev, device_t child, int type, static int xenpci_probe(device_t dev) { + return (ENXIO); if (pci_get_devid(dev) != 0x00015853) return (ENXIO); diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 72811dc..cb3868e 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -563,6 +563,8 @@ xen_hvm_init_hypercall_stubs(void) uint32_t base, regs[4]; int i; + return (ENXIO); + base = xen_hvm_cpuid_base(); if (base == 0) return (ENXIO); -- 1.7.7.5 (Apple Git-26)