78 lines
2.6 KiB
Diff
78 lines
2.6 KiB
Diff
|
From 2d4b19613c462e876ee1327d600f5cbbb998c540 Mon Sep 17 00:00:00 2001
|
||
|
|
Message-Id: <2d4b19613c462e876ee1327d600f5cbbb998c540@dist-git>
|
||
|
|
From: John Ferlan <jferlan@redhat.com>
|
||
|
|
Date: Mon, 17 Dec 2018 20:42:30 -0500
|
||
|
|
Subject: [PATCH] RHEL: qemu: Add ability to set sgio values for hostdev
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1582424
|
||
|
|
|
||
|
|
RHEL-only
|
||
|
|
|
||
|
|
Add necessary checks in order to allow setting sgio values for a scsi
|
||
|
|
host device
|
||
|
|
|
||
|
|
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
||
|
|
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
||
|
|
(cherry picked from commit f2cf0ae7bc371c75f6c0e79192711f2b1d201b10)
|
||
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
||
|
|
---
|
||
|
|
src/qemu/qemu_conf.c | 16 +++++++++-------
|
||
|
|
1 file changed, 9 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
|
||
|
|
index a4f545ef92..3ea9784854 100644
|
||
|
|
--- a/src/qemu/qemu_conf.c
|
||
|
|
+++ b/src/qemu/qemu_conf.c
|
||
|
|
@@ -1633,6 +1633,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
||
|
|
virDomainDiskDefPtr disk = NULL;
|
||
|
|
virDomainHostdevDefPtr hostdev = NULL;
|
||
|
|
char *sysfs_path = NULL;
|
||
|
|
+ char *hostdev_path = NULL;
|
||
|
|
const char *path = NULL;
|
||
|
|
int val = -1;
|
||
|
|
int ret = -1;
|
||
|
|
@@ -1654,14 +1655,10 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
||
|
|
if (!qemuIsSharedHostdev(hostdev))
|
||
|
|
return 0;
|
||
|
|
|
||
|
|
- if (hostdev->source.subsys.u.scsi.sgio) {
|
||
|
|
- virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
||
|
|
- _("'sgio' is not supported for SCSI "
|
||
|
|
- "generic device yet "));
|
||
|
|
+ if (!(hostdev_path = qemuGetHostdevPath(hostdev)))
|
||
|
|
goto cleanup;
|
||
|
|
- }
|
||
|
|
|
||
|
|
- return 0;
|
||
|
|
+ path = hostdev_path;
|
||
|
|
} else {
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
@@ -1670,7 +1667,11 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
||
|
|
goto cleanup;
|
||
|
|
|
||
|
|
/* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */
|
||
|
|
- val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED);
|
||
|
|
+ if (dev->type == VIR_DOMAIN_DEVICE_DISK)
|
||
|
|
+ val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED);
|
||
|
|
+ else
|
||
|
|
+ val = (hostdev->source.subsys.u.scsi.sgio ==
|
||
|
|
+ VIR_DOMAIN_DEVICE_SGIO_UNFILTERED);
|
||
|
|
|
||
|
|
/* Do not do anything if unpriv_sgio is not supported by the kernel and the
|
||
|
|
* whitelist is enabled. But if requesting unfiltered access, always call
|
||
|
|
@@ -1683,6 +1684,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
||
|
|
ret = 0;
|
||
|
|
|
||
|
|
cleanup:
|
||
|
|
+ VIR_FREE(hostdev_path);
|
||
|
|
VIR_FREE(sysfs_path);
|
||
|
|
return ret;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|