From 0cab1924c29e534c5daca977dad42ef75b3c3e16 Mon Sep 17 00:00:00 2001 From: Archana Shinde Date: Fri, 21 Sep 2018 14:21:50 -0700 Subject: [PATCH] block: Advertise block support for q35 Add block device capability for q35 as this machine type supports it. This was never added with the introduction of q35 support. Fixes #771 Signed-off-by: Archana Shinde --- virtcontainers/qemu_amd64.go | 3 +-- virtcontainers/qemu_amd64_test.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/virtcontainers/qemu_amd64.go b/virtcontainers/qemu_amd64.go index 2fae39cb5e..382d003053 100644 --- 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 index b8b824c762..61e2146787 100644 --- 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) {