Merge pull request #633 from rgooch/master

Support disabling virtio for VMs.
Symantec · Aug 4, 2019 · 8e159f9 · 8e159f9
2 parents d8a2919 + b3efe7d
commit 8e159f9
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 8 deletions.
diff --git a/cmd/vm-control/createVm.go b/cmd/vm-control/createVm.go
@@ -102,6 +102,7 @@ func createVmInfoFromFlags() hyper_proto.VmInfo {
 	return hyper_proto.VmInfo{
 		ConsoleType:        consoleType,
 		DestroyProtection:  *destroyProtection,
+		DisableVirtIO:      *disableVirtIO,
 		Hostname:           *vmHostname,
 		MemoryInMiB:        uint64(memory >> 20),
 		MilliCPUs:          *milliCPUs,

diff --git a/cmd/vm-control/importVirshVm.go b/cmd/vm-control/importVirshVm.go
@@ -201,11 +201,12 @@ func importVirshVm(macAddr, domainName string, sAddrs []proto.Address,
 		tags["Name"] = domainName
 	}
 	request := proto.ImportLocalVmRequest{VmInfo: proto.VmInfo{
-		ConsoleType: consoleType,
-		Hostname:    domainName,
-		OwnerGroups: ownerGroups,
-		OwnerUsers:  ownerUsers,
-		Tags:        tags,
+		ConsoleType:   consoleType,
+		DisableVirtIO: *disableVirtIO,
+		Hostname:      domainName,
+		OwnerGroups:   ownerGroups,
+		OwnerUsers:    ownerUsers,
+		Tags:          tags,
 	}}
 	verificationCookie, err := readRootCookie(logger)
 	if err != nil {

diff --git a/cmd/vm-control/main.go b/cmd/vm-control/main.go
@@ -24,6 +24,8 @@ var (
 	consoleType       hyper_proto.ConsoleType
 	destroyProtection = flag.Bool("destroyProtection", false,
 		"If true, do not destroy running VM")
+	disableVirtIO = flag.Bool("disableVirtIO", false,
+		"If true, disable virtio drivers, reducing I/O performance")
 	dhcpTimeout = flag.Duration("dhcpTimeout", time.Minute,
 		"Time to wait before timing out on DHCP request from VM")
 	fleetManagerHostname = flag.String("fleetManagerHostname", "",

diff --git a/hypervisor/manager/vm.go b/hypervisor/manager/vm.go
@@ -281,6 +281,7 @@ func (m *Manager) allocateVm(req proto.CreateVmRequest,
 				Address:            address,
 				ConsoleType:        req.ConsoleType,
 				DestroyProtection:  req.DestroyProtection,
+				DisableVirtIO:      req.DisableVirtIO,
 				Hostname:           req.Hostname,
 				ImageName:          req.ImageName,
 				ImageURL:           req.ImageURL,
@@ -2782,6 +2783,10 @@ func (vm *vmInfoType) getBridgesAndOptions(haveManagerLock bool) (
 		subnetIDs = append(subnetIDs, subnetId)
 	}
 	var bridges, options []string
+	deviceDriver := "virtio-net-pci"
+	if vm.DisableVirtIO {
+		deviceDriver = "e1000"
+	}
 	for index, address := range addresses {
 		subnet, ok := vm.manager.subnets[subnetIDs[index]]
 		if !ok {
@@ -2802,8 +2807,8 @@ func (vm *vmInfoType) getBridgesAndOptions(haveManagerLock bool) (
 		options = append(options,
 			"-netdev", fmt.Sprintf("tap,id=net%d,fd=%d%s",
 				index, index+3, vlanOption),
-			"-device", fmt.Sprintf("virtio-net-pci,netdev=net%d,mac=%s",
-				index, address.MacAddress))
+			"-device", fmt.Sprintf("%s,netdev=net%d,mac=%s",
+				deviceDriver, index, address.MacAddress))
 	}
 	return bridges, options, nil
 }
@@ -2873,14 +2878,18 @@ func (vm *vmInfoType) startVm(haveManagerLock bool) error {
 				"-vga", "std")
 		}
 	}
+	var interfaceDriver string
+	if !vm.DisableVirtIO {
+		interfaceDriver = ",if=virtio"
+	}
 	for index, volume := range vm.VolumeLocations {
 		var volumeFormat proto.VolumeFormat
 		if index < len(vm.Volumes) {
 			volumeFormat = vm.Volumes[index].Format
 		}
 		cmd.Args = append(cmd.Args,
 			"-drive", "file="+volume.Filename+",format="+volumeFormat.String()+
-				",if=virtio")
+				interfaceDriver)
 	}
 	os.Remove(filepath.Join(vm.dirname, "bootlog"))
 	cmd.ExtraFiles = tapFiles // Start at fd=3 for QEMU.

diff --git a/proto/hypervisor/messages.go b/proto/hypervisor/messages.go
@@ -517,6 +517,7 @@ type VmInfo struct {
 	Address            Address
 	ConsoleType        ConsoleType `json:",omitempty"`
 	DestroyProtection  bool        `json:",omitempty"`
+	DisableVirtIO      bool        `json:",omitempty"`
 	Hostname           string      `json:",omitempty"`
 	ImageName          string      `json:",omitempty"`
 	ImageURL           string      `json:",omitempty"`

diff --git a/proto/hypervisor/methods.go b/proto/hypervisor/methods.go
@@ -222,6 +222,9 @@ func (left *VmInfo) Equal(right *VmInfo) bool {
 	if left.DestroyProtection != right.DestroyProtection {
 		return false
 	}
+	if left.DisableVirtIO != right.DisableVirtIO {
+		return false
+	}
 	if left.Hostname != right.Hostname {
 		return false
 	}