From 404a5274cdd489a9f4f3778d09972877785e263a Mon Sep 17 00:00:00 2001 From: Sebastian Boehm Date: Sat, 13 Jun 2015 18:49:31 +0200 Subject: [PATCH 1/2] Add error message for CPUs without EPT, fixes #18 --- src/vmm/intel/vmx.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/vmm/intel/vmx.c b/src/vmm/intel/vmx.c index d0be45f..f4f2bb0 100644 --- a/src/vmm/intel/vmx.c +++ b/src/vmm/intel/vmx.c @@ -464,10 +464,15 @@ vmx_cleanup(void) static int vmx_init(void) { - int error; - - if (hv_vm_create(HV_VM_DEFAULT)) { - xhyve_abort("hv_vm_create failed\n"); + int error = hv_vm_create(HV_VM_DEFAULT); + if (error) { + if (error == HV_NO_DEVICE) { + printf("vmx_init: processor not supported by " + "Hypervisor.framework\n"); + return (error); + } + else + xhyve_abort("hv_vm_create failed\n"); } /* Check support for primary processor-based VM-execution controls */ From e07b5d7e24cb07bc6e8c1ef6e280ac243911de4b Mon Sep 17 00:00:00 2001 From: Sebastian Boehm Date: Sat, 13 Jun 2015 19:18:07 +0200 Subject: [PATCH 2/2] Add build directory to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..84c048a --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/build/