Merge pull request #772 from amshinde/block-support-q35

block: Advertise block support for q35
kata-containers · Oct 2, 2018 · 532e0bb · 532e0bb
2 parents 9bc5828 + 0cab192
commit 532e0bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/virtcontainers/qemu_amd64.go b/virtcontainers/qemu_amd64.go
@@ -102,8 +102,7 @@ func newQemuArch(config HypervisorConfig) qemuArch {
 func (q *qemuAmd64) capabilities() capabilities {
 	var caps capabilities
 
-	// Only pc machine type supports hotplugging drives
-	if q.machineType == QemuPC {
+	if q.machineType == QemuPC || q.machineType == QemuQ35 {
 		caps.setBlockDeviceHotplugSupport()
 	}
 

diff --git a/virtcontainers/qemu_amd64_test.go b/virtcontainers/qemu_amd64_test.go
@@ -31,7 +31,7 @@ func TestQemuAmd64Capabilities(t *testing.T) {
 
 	amd64 = newTestQemu(QemuQ35)
 	caps = amd64.capabilities()
-	assert.False(caps.isBlockDeviceHotplugSupported())
+	assert.True(caps.isBlockDeviceHotplugSupported())
 }
 
 func TestQemuAmd64Bridges(t *testing.T) {