forked from rpms/libvirt
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
|
From 163740bff28c6f1a82663bc652f2cd5df39e4276 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <163740bff28c6f1a82663bc652f2cd5df39e4276@dist-git>
|
||
|
|
From: John Ferlan <jferlan@redhat.com>
|
||
|
|
Date: Fri, 25 Jan 2019 12:19:12 -0500
|
||
|
|
Subject: [PATCH] RHEL: qemu: Fix crash trying to use iSCSI hostdev
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1669424
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1669966
|
||
|
|
|
||
|
|
RHEL-only
|
||
|
|
|
||
|
|
Commit 861a1a4d2 moved the qemuIsSharedHostdev filter in the
|
||
|
|
HOSTDEV half of the logic to allow calling qemuGetHostdevPath;
|
||
|
|
however, that neglected to check whether the SCSI hostdev was
|
||
|
|
using the iSCSI protocol which has a different overlayed struct
|
||
|
|
format (u.iscsi vs. u.host) resulting in attempted access of
|
||
|
|
u.host when calling virSCSIDeviceGetDevName.
|
||
|
|
|
||
|
|
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_conf.c | 4 ++++
|
||
|
|
1 file changed, 4 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
|
||
|
|
index 0674292fab..3d2f0e7bbb 100644
|
||
|
|
--- a/src/qemu/qemu_conf.c
|
||
|
|
+++ b/src/qemu/qemu_conf.c
|
||
|
|
@@ -1844,6 +1844,10 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
||
|
|
} else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) {
|
||
|
|
hostdev = dev->data.hostdev;
|
||
|
|
|
||
|
|
+ if (hostdev->source.subsys.u.scsi.protocol ==
|
||
|
|
+ VIR_DOMAIN_HOSTDEV_SCSI_PROTOCOL_TYPE_ISCSI)
|
||
|
|
+ return 0;
|
||
|
|
+
|
||
|
|
if (!(hostdev_path = qemuGetHostdevPath(hostdev)))
|
||
|
|
return -1;
|
||
|
|
|
||
|
|
--
|
||
|
|
2.25.0
|
||
|
|
|