[libvirt] [PATCH] Ignore virtio-mmio disks in qemuAssignDevicePCISlots()

Pavel Fedin p.fedin at samsung.com
Tue Sep 8 12:23:27 UTC 2015


Fixes the following error when attempting to add a disk with bus='virtio':

virtio only support device address type 'PCI'

Signed-off-by: Pavel Fedin <p.fedin at samsung.com>
---
 src/qemu/qemu_command.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 38104da..408b249 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2189,12 +2189,14 @@ qemuAssignDevicePCISlots(virDomainDefPtr def,
         if (def->disks[i]->bus != VIR_DOMAIN_DISK_BUS_VIRTIO)
             continue;
 
-        /* don't touch s390 devices */
+        /* don't touch s390 and virtio-mmio devices */
         if (def->disks[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI ||
             def->disks[i]->info.type ==
             VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_S390 ||
             def->disks[i]->info.type ==
-            VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW)
+            VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW ||
+            def->disks[i]->info.type ==
+            VIR_DOMAIN_DEVICE_ADDRESS_TYPE_VIRTIO_MMIO)
             continue;
 
         if (def->disks[i]->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
-- 
1.9.5.msysgit.0





More information about the libvir-list mailing list