From 74c204ec878e287e4d5750e9e865f29557d38ae5 Mon Sep 17 00:00:00 2001 From: Ali Moeeny Date: Mon, 14 Sep 2015 14:43:37 -0400 Subject: [PATCH 1/8] added instructions for homebrew Just for the sake of completeness. --- README.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3370283..4a75f77 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,20 @@ Requirements * OS X 10.10.3 Yosemite or later * a 2010 or later Mac (i.e. a CPU that supports EPT) +Installation +------------ + +If you have home brew, then simply: + + $ brew update + $ brew install xhyve + +if not then: + Building -------- - + $ git clone https://github.com/mist64/xhyve + $ cd xhyve $ make The resulting binary will be in build/xhyve From eed74ba45d40dd7ea7f019290ec53c1bf13f3b2d Mon Sep 17 00:00:00 2001 From: Ali Moeeny Date: Tue, 15 Sep 2015 07:59:47 -0400 Subject: [PATCH 2/8] Fixed spelling of homebrew --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a75f77..ecdf4fd 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Requirements Installation ------------ -If you have home brew, then simply: +If you have homebrew, then simply: $ brew update $ brew install xhyve From fae82085cdf529ce8fcf8d8b3366943c5bffa3fa Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Fri, 11 Sep 2015 16:08:35 +0200 Subject: [PATCH 3/8] Fixes #52: Help text (-h) for memory size (-m) is incorrect. --- src/xhyve.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/xhyve.c b/src/xhyve.c index 224a74b..55367c5 100644 --- a/src/xhyve.c +++ b/src/xhyve.c @@ -136,6 +136,7 @@ usage(int code) " -h: help\n" " -H: vmexit from the guest on hlt\n" " -l: LPC device configuration\n" + " -m: memory size in MB, may be suffixed with one of K, M, G or T\n" " -m: memory size in MB\n" " -M: print MAC address and exit if using vmnet\n" " -p: pin 'vcpu' to 'hostcpu'\n" From dad514462c40927a0d60a0adea3e99f5f1ca596d Mon Sep 17 00:00:00 2001 From: Ali Moeeny Date: Wed, 24 Feb 2016 07:45:12 -0500 Subject: [PATCH 4/8] changed the brew command to always pull HEAD --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ecdf4fd..24051cc 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Installation If you have homebrew, then simply: $ brew update - $ brew install xhyve + $ brew install --HEAD xhyve if not then: From a9a041cb13a12c2e509a613190e09179da45b05f Mon Sep 17 00:00:00 2001 From: Ali Moeeny Date: Wed, 24 Feb 2016 07:49:54 -0500 Subject: [PATCH 5/8] added a comment to make the `--HEAD` more clear --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 24051cc..811f25b 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,8 @@ If you have homebrew, then simply: $ brew update $ brew install --HEAD xhyve +The `--HEAD` in the brew command ensures that you always get the latest changes, even if the homebrew database is not yet updated. If for any reason you don't want that simply do `brew install xhyve` . + if not then: Building From 7698501cf8150c3577667682011e3944d987e2f8 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Thu, 24 Mar 2016 16:01:54 +0100 Subject: [PATCH 6/8] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e5b685..e0924c5 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ It exposes the following peripherals to virtual machines: Notably absent are sound, USB, HID and any kind of graphics support. With a focus on server virtualization this is not strictly a requirement. bhyve may gain desktop virtualization capabilities in the future but this doesn't seem to be a priority. -Unlike QEMU, byhve also currently lacks any kind of guest-side firmware (QEMU uses the GPL3 [SeaBIOS](http://www.seabios.org)), but aims to provide a compatible [OVMF EFI](http://www.linux-kvm.org/page/OVMF) in the near future. It does however provide ACPI, SMBIOS and MP Tables. +Unlike QEMU, bhyve also currently lacks any kind of guest-side firmware (QEMU uses the GPL3 [SeaBIOS](http://www.seabios.org)), but aims to provide a compatible [OVMF EFI](http://www.linux-kvm.org/page/OVMF) in the near future. It does however provide ACPI, SMBIOS and MP Tables. bhyve architecture ------------------ From 791b47541b9fbb05b4bd25994a10750c37efb8eb Mon Sep 17 00:00:00 2001 From: Radu Popescu Date: Wed, 30 Mar 2016 23:35:22 +0200 Subject: [PATCH 7/8] Fixing compilation on OS X 10.11.4 and Xcode 7.3 OS X 10.11.4 (15E65) Xcode Version 7.3 (7D175) Apple LLVM version 7.3.0 (clang-703.0.29) --- src/vmm/io/vhpet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vmm/io/vhpet.c b/src/vmm/io/vhpet.c index 1d81861..3e13bda 100644 --- a/src/vmm/io/vhpet.c +++ b/src/vmm/io/vhpet.c @@ -221,7 +221,7 @@ vhpet_timer_interrupt(struct vhpet *vhpet, int n) lapic_intr_msi(vhpet->vm, vhpet->timer[n].msireg >> 32, vhpet->timer[n].msireg & 0xffffffff); return; - } + } pin = vhpet_timer_ioapic_pin(vhpet, n); if (pin == 0) { @@ -291,7 +291,7 @@ vhpet_handler(void *a) callout_deactivate(callout); if (!vhpet_counter_enabled(vhpet)) - xhyve_abort("vhpet(%p) callout with counter disabled\n", vhpet); + xhyve_abort("vhpet(%p) callout with counter disabled\n", (void*)vhpet); counter = vhpet_counter(vhpet, &now); vhpet_start_timer(vhpet, n, counter, now); @@ -483,7 +483,7 @@ vhpet_mmio_write(void *vm, UNUSED int vcpuid, uint64_t gpa, uint64_t val, int si if ((offset & 0x4) != 0) { mask <<= 32; data <<= 32; - } + } break; default: VM_CTR2(vhpet->vm, "hpet invalid mmio write: " @@ -638,7 +638,7 @@ vhpet_mmio_read(void *vm, UNUSED int vcpuid, uint64_t gpa, uint64_t *rval, int s if (offset == HPET_CAPABILITIES || offset == HPET_CAPABILITIES + 4) { data = vhpet_capabilities(); - goto done; + goto done; } if (offset == HPET_CONFIG || offset == HPET_CONFIG + 4) { From 86698000e1e5c72ba2df776b3dff3ff0c05dfbb7 Mon Sep 17 00:00:00 2001 From: xez Date: Wed, 30 Mar 2016 23:48:13 -0700 Subject: [PATCH 8/8] Remove duplicate -h line. --- src/xhyve.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/xhyve.c b/src/xhyve.c index 55367c5..7617f71 100644 --- a/src/xhyve.c +++ b/src/xhyve.c @@ -137,7 +137,6 @@ usage(int code) " -H: vmexit from the guest on hlt\n" " -l: LPC device configuration\n" " -m: memory size in MB, may be suffixed with one of K, M, G or T\n" - " -m: memory size in MB\n" " -M: print MAC address and exit if using vmnet\n" " -p: pin 'vcpu' to 'hostcpu'\n" " -P: vmexit from the guest on pause\n"