Merge pull request kata-containers#805 from sboeuf/fix_virt

virtcontainers: qemu: Add proper support for virt machine type
flx42 · Oct 4, 2018 · c3cfe82 · c3cfe82
2 parents a0968ce + dffb4f9
commit c3cfe82
Show file tree

Hide file tree

Showing 6 changed files with 154 additions and 19 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -52,7 +52,7 @@
 
 [[constraint]]
   name = "github.com/intel/govmm"
-  revision = "9905ae92c5915c07abeb669eaa4d7f7408834b51"
+  revision = "f03df80fc3dc52f65ed6c7d12806279b44185d32"
 
 [[constraint]]
   name = "github.com/kata-containers/agent"

diff --git a/vendor/github.com/intel/govmm/qemu/qemu.go b/vendor/github.com/intel/govmm/qemu/qemu.go
diff --git a/vendor/github.com/intel/govmm/qemu/qmp.go b/vendor/github.com/intel/govmm/qemu/qmp.go
diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
@@ -1194,7 +1194,8 @@ func (q *qemu) disconnect() {
 // genericAppendBridges appends to devices the given bridges
 func genericAppendBridges(devices []govmmQemu.Device, bridges []Bridge, machineType string) []govmmQemu.Device {
 	bus := defaultPCBridgeBus
-	if machineType == QemuQ35 {
+	switch machineType {
+	case QemuQ35, QemuVirt:
 		bus = defaultBridgeBus
 	}
 
@@ -1227,13 +1228,14 @@ func genericBridges(number uint32, machineType string) []Bridge {
 	var bt bridgeType
 
 	switch machineType {
-
 	case QemuQ35:
 		// currently only pci bridges are supported
 		// qemu-2.10 will introduce pcie bridges
 		fallthrough
 	case QemuPC:
 		bt = pciBridge
+	case QemuVirt:
+		bt = pcieBridge
 	case QemuPseries:
 		bt = pciBridge
 	default:

diff --git a/virtcontainers/qemu_amd64.go b/virtcontainers/qemu_amd64.go
@@ -102,7 +102,9 @@ func newQemuArch(config HypervisorConfig) qemuArch {
 func (q *qemuAmd64) capabilities() capabilities {
 	var caps capabilities
 
-	if q.machineType == QemuPC || q.machineType == QemuQ35 {
+	if q.machineType == QemuPC ||
+		q.machineType == QemuQ35 ||
+		q.machineType == QemuVirt {
 		caps.setBlockDeviceHotplugSupport()
 	}