diff options
| author | Kris Alder <kalder@google.com> | 2022-08-23 09:11:43 -0700 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2022-08-25 16:07:54 +0200 |
| commit | 9b5bf4cde89c7042ba16872f3a663e1be5d86638 (patch) | |
| tree | a49fdb6c3a71271172d659cb5dbdbb3ac4135f26 /vm | |
| parent | e5fb9cf5f9e9fb6e1515a70b44b6942be76b1563 (diff) | |
pkg/gce, vm/gce: add param to enable nested virtualization
This is needed for Cuttlefish-on-GCE. It adds the field 'nested_virt' to
the config file and then passes it through to the relevant field in the
call to gce.CreateInstance().
Diffstat (limited to 'vm')
| -rw-r--r-- | vm/gce/gce.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/vm/gce/gce.go b/vm/gce/gce.go index ef213d12e..01ce6548b 100644 --- a/vm/gce/gce.go +++ b/vm/gce/gce.go @@ -46,6 +46,7 @@ type Config struct { GCEImage string `json:"gce_image"` // pre-created GCE image to use Preemptible bool `json:"preemptible"` // use preemptible VMs if available (defaults to true) DisplayDevice bool `json:"display_device"` // enable a virtual display device + NestedVirt bool `json:"nested_virt"` // enable nested virtualization } type Pool struct { @@ -152,8 +153,13 @@ func (pool *Pool) Create(workdir string, index int) (vmimpl.Instance, error) { return nil, err } log.Logf(0, "creating instance: %v", name) + args := gce.CreateArgs{ + Preemptible: pool.cfg.Preemptible, + DisplayDevice: pool.cfg.DisplayDevice, + NestedVirt: pool.cfg.NestedVirt, + } ip, err := pool.GCE.CreateInstance(name, pool.cfg.MachineType, pool.cfg.GCEImage, - string(gceKeyPub), pool.cfg.Preemptible, pool.cfg.DisplayDevice) + string(gceKeyPub), args) if err != nil { return nil, err } |
