aboutsummaryrefslogtreecommitdiffstats
path: root/vm
diff options
context:
space:
mode:
authorKris Alder <kalder@google.com>2022-08-31 09:11:35 -0700
committerDmitry Vyukov <dvyukov@google.com>2022-09-02 12:16:49 +0200
commita577205ebe1f58124fc8b58e3ccc2ac2d690e89d (patch)
tree45ade81ec1daa66079dfb83f0ec9d6c08f86b0fb /vm
parenta805568e4d02790fde7024112cf476d48c43c06b (diff)
pkg/gce, vm/gce: leave nested virt support up to images
Since this can be enabled on per-image basis, we don't need to specifically add this to the creation RPC. This is basically a revert of https://github.com/google/syzkaller/pull/3328.
Diffstat (limited to 'vm')
-rw-r--r--vm/gce/gce.go8
1 files changed, 1 insertions, 7 deletions
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
}