stv0g/xhyve
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'mist64/master'

Browse source
This commit is contained in:
Jeremy Huddleston Sequoia 2016-04-03 12:18:23 -07:00
commit 08b0e29280
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -20,10 +20,11 @@ Requirements
Building
--------
$ git clone https://github.com/xhyve-xyz/xhyve.git
$ cd xhyve
$ xcodebuild
$ make
The resulting binary will be in build/xhyve
The resulting binary will be in build/Release/xhyve
Usage
-----
@ -56,7 +57,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
------------------

8
src/vmm/io/vhpet.c
View file

@ -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", (void *)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) {

2
src/xhyve.c
View file

@ -138,7 +138,7 @@ usage(int code)
" -g: gdb port\n"
" -h: help\n"
" -H: vmexit from the guest on hlt\n"
" -l: LPC device configuration. Ex: -l com1,stdio -l com2,autopty -l com2,/dev/myownpty\n"
" -l: LPC device configuration\n"
" -m: memory size in MB, may be suffixed with one of K, M, G or T\n"
" -M: print MAC address and exit if using vmnet\n"
" -p: pin 'vcpu' to 'hostcpu'\n"