diff options
| -rw-r--r-- | pkg/gce/gce.go | 10 | ||||
| -rw-r--r-- | vm/gce/gce.go | 8 |
2 files changed, 4 insertions, 14 deletions
diff --git a/pkg/gce/gce.go b/pkg/gce/gce.go index 542cf1650..7a72f1bfd 100644 --- a/pkg/gce/gce.go +++ b/pkg/gce/gce.go @@ -46,7 +46,6 @@ type Context struct { type CreateArgs struct { Preemptible bool DisplayDevice bool - NestedVirt bool } func NewContext(customZoneID string) (*Context, error) { @@ -109,7 +108,7 @@ func NewContext(customZoneID string) (*Context, error) { } func (ctx *Context) CreateInstance(name, machineType, image, sshkey string, - args CreateArgs) (string, error) { + preemptible, displayDevice bool) (string, error) { prefix := "https://www.googleapis.com/compute/v1/projects/" + ctx.ProjectID sshkeyAttr := "syzkaller:" + sshkey oneAttr := "1" @@ -149,14 +148,11 @@ func (ctx *Context) CreateInstance(name, machineType, image, sshkey string, }, Scheduling: &compute.Scheduling{ AutomaticRestart: &falseAttr, - Preemptible: args.Preemptible, + Preemptible: preemptible, OnHostMaintenance: "TERMINATE", }, DisplayDevice: &compute.DisplayDevice{ - EnableDisplay: args.DisplayDevice, - }, - AdvancedMachineFeatures: &compute.AdvancedMachineFeatures{ - EnableNestedVirtualization: args.NestedVirt, + EnableDisplay: displayDevice, }, } retry: diff --git a/vm/gce/gce.go b/vm/gce/gce.go index 01ce6548b..ef213d12e 100644 --- a/vm/gce/gce.go +++ b/vm/gce/gce.go @@ -46,7 +46,6 @@ 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 { @@ -153,13 +152,8 @@ 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), args) + string(gceKeyPub), pool.cfg.Preemptible, pool.cfg.DisplayDevice) if err != nil { return nil, err } |