add vsock support

daemon/daemon.go

@@ -205,7 +205,7 @@ func (daemon *Daemon) initRunV(c *apitypes.HyperConfig) error {
 
 	daemon.Hypervisor = c.Driver
 	glog.Infof("The hypervisor's driver is %s", c.Driver)
-	daemon.Factory = factory.NewFromPolicy(c.Kernel, c.Initrd, c.VmFactoryPolicy)
+	daemon.Factory = factory.NewFromPolicy(c.Kernel, c.Initrd, c.EnableVsock, c.VmFactoryPolicy)
 
 	return nil
 }

daemon/pod/container.go

@@ -893,7 +893,10 @@ func (c *Container) addToSandbox() error {
 		Stdout: c.streams.Stdout(),
 		Stderr: c.streams.Stderr(),
 	}
-	c.p.sandbox.Attach(tty, c.Id(), nil)
+	if err := c.p.sandbox.Attach(tty, c.Id()); err != nil {
+		c.Log(ERROR, err)
+		return err
+	}
 
 	c.status.Created(time.Now())
 	return nil

daemon/pod/sandbox.go

@@ -34,7 +34,7 @@ func startSandbox(f factory.Factory, cpu, mem int, kernel, initrd string) (vm *h
 			Kernel: kernel,
 			Initrd: initrd,
 		}
-		vm, err = hypervisor.GetVm("", config, false, hypervisor.HDriver.SupportLazyMode())
+		vm, err = hypervisor.GetVm("", config, false)
 	}
 	if err != nil {
 		hlog.Log(ERROR, "failed to create a sandbox (cpu=%d, mem=%d kernel=%s initrd=%d): %v", cpu, mem, kernel, initrd, err)
@@ -44,8 +44,7 @@ func startSandbox(f factory.Factory, cpu, mem int, kernel, initrd string) (vm *h
 }
 
 func associateSandbox(id string, vmData []byte) (vm *hypervisor.Vm, err error) {
-	vm = hypervisor.NewVm(id, 0, 0, false)
-	err = vm.AssociateVm(vmData)
+	vm, err = hypervisor.AssociateVm(id, vmData)
 	if err != nil {
 		return nil, err
 	}

package/dist/etc/hyper/config

@@ -44,6 +44,9 @@ Initrd=/var/lib/hyper/hyper-initrd.img
 # This is only useful for hypernetes, to disable the iptables setup by hyperd
 # DisableIptables=false
 
+# Enable vsock support. This only works with libvirt/qemu hypervisor and template disabled
+# EnableVsock=false
+
 # VmFactoryPolicy defines the policies to create factories
 # VmFactoryPolicy = [FactoryConfig,]*FactoryConfig
 # FactoryConfig   = {["cache":NUMBER,]["template":(true|false),]"cpu":NUMBER,"memory":NUMBER}

types/config.go

@@ -24,6 +24,7 @@ type HyperConfig struct {
 	Bridge          string
 	BridgeIP        string
 	DisableIptables bool
+	EnableVsock     bool
 	DefaultLog      string
 	DefaultLogOpt   map[string]string
 
@@ -62,6 +63,7 @@ func NewHyperConfig(config string) *HyperConfig {
 	driver, _ := cfg.GetValue(goconfig.DEFAULT_SECTION, "Hypervisor")
 	c.Driver = strings.ToLower(driver)
 	c.DisableIptables = cfg.MustBool(goconfig.DEFAULT_SECTION, "DisableIptables", false)
+	c.EnableVsock = cfg.MustBool(goconfig.DEFAULT_SECTION, "EnableVsock", false)
 	c.DefaultLog, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "Logger")
 	c.DefaultLogOpt, _ = cfg.GetSection("Log")
 	c.VmFactoryPolicy, _ = cfg.GetValue(goconfig.DEFAULT_SECTION, "VmFactoryPolicy")