]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemuCheckDiskConfigAgainstDomain: Validate disk's SCSI address iff disk is SCSI
authorXu Yandong <xuyandong2@huawei.com>
Thu, 19 Sep 2019 08:02:36 +0000 (04:02 -0400)
committerMichal Privoznik <mprivozn@redhat.com>
Thu, 19 Sep 2019 14:32:56 +0000 (16:32 +0200)
Check the disk SCSI address only when the disk actually is of
SCSI type.

Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_driver.c

index 1e041a8bac01bbf3de88ebe4a4b0356b8012e5bb..0753904472df93e6e66b501ba0a3dd37340e5ea2 100644 (file)
@@ -8314,7 +8314,8 @@ static int
 qemuCheckDiskConfigAgainstDomain(const virDomainDef *def,
                                  const virDomainDiskDef *disk)
 {
-    if (virDomainSCSIDriveAddressIsUsed(def, &disk->info.addr.drive)) {
+    if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI &&
+        virDomainSCSIDriveAddressIsUsed(def, &disk->info.addr.drive)) {
         virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                        _("Domain already contains a disk with that address"));
         return -1;