iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7151 from nelsonjchen/qemu-whpx-option 

Add support for whpx accelerator to qemu builder
This commit is contained in:
Megan Marsh 2019-01-04 12:37:03 -08:00 committed by GitHub
parent c789a68d89 b39f398fda
commit 16149844a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builder/qemu/builder.go
View File

@ -28,6 +28,7 @@ var accels = map[string]struct{}{
"xen": {},
"hax": {},
"hvf": {},
"whpx": {},
}
var netDevice = map[string]bool{
@ -274,7 +275,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
if _, ok := accels[b.config.Accelerator]; !ok {
errs = packer.MultiErrorAppend(
errs, errors.New("invalid accelerator, only 'kvm', 'tcg', 'xen', 'hax', 'hvf', or 'none' are allowed"))
errs, errors.New("invalid accelerator, only 'kvm', 'tcg', 'xen', 'hax', 'hvf', 'whpx', or 'none' are allowed"))
}
if _, ok := netDevice[b.config.NetDevice]; !ok {

10
website/source/docs/builders/qemu.html.md.erb
View File

@ -107,7 +107,7 @@ Linux server and have not enabled X11 forwarding (`ssh -X`).
### Optional:
- `accelerator` (string) - The accelerator type to use when running the VM.
This may be `none`, `kvm`, `tcg`, `hax`, `hvf`, or `xen`. The appropriate
This may be `none`, `kvm`, `tcg`, `hax`, `hvf`, `whpx`, or `xen`. The appropriate
software must have already been installed on your build machine to use the
accelerator you specified. When no accelerator is specified, Packer will try
to use `kvm` if it is available but will default to `tcg` otherwise.
@ -116,12 +116,16 @@ Linux server and have not enabled X11 forwarding (`ssh -X`).
upstream issue which can be tracked
[here](https://github.com/intel/haxm/issues/20).
-> The `hvf` accelerator is new and experimental as of
-> The `hvf` and `whpx` accelerator are new and experimental as of
[QEMU 2.12.0](https://wiki.qemu.org/ChangeLog/2.12#Host_support).
You may encounter issues unrelated to Packer when using it. You may need to
You may encounter issues unrelated to Packer when using these. You may need to
add [ "-global", "virtio-pci.disable-modern=on" ] to `qemuargs` depending on the
guest operating system.
-> For `whpx`, note that [Stefan Weil's QEMU for Windows distribution](https://qemu.weilnetz.de/w64/)
does not include WHPX support and users may need to compile or source a
build of QEMU for Windows themselves with WHPX support.
- `boot_command` (array of strings) - This is an array of commands to type
when the virtual machine is first booted. The goal of these commands should
be to type just enough to initialize the operating system installer. Special