Merge 6924d7c into 065d1d2

kata-containers · Feb 12, 2018 · 102aeef · 102aeef
2 parents 065d1d2 + 6924d7c
commit 102aeef
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/qemu/qemu.go b/qemu/qemu.go
@@ -43,6 +43,10 @@ type Machine struct {
 
 	// Acceleration are the machine acceleration options to be used by qemu.
 	Acceleration string
+
+	// ExtraOptions are extra options for the machine type
+	// For example gic-version=host and usb=off
+	ExtraOptions string
 }
 
 // Device is the qemu device interface.
@@ -1240,6 +1244,10 @@ func (config *Config) appendMachine() {
 			machineParams = append(machineParams, fmt.Sprintf(",accel=%s", config.Machine.Acceleration))
 		}
 
+		if config.Machine.ExtraOptions != "" {
+			machineParams = append(machineParams, fmt.Sprintf(",%s", config.Machine.ExtraOptions))
+		}
+
 		config.qemuParams = append(config.qemuParams, "-machine")
 		config.qemuParams = append(config.qemuParams, strings.Join(machineParams, ""))
 	}