提交 ec6754db 编写于 作者: J John Ferlan

Revert "qemu: Fix integer/boolean logic in qemuSetUnprivSGIO"

This reverts commit 69b850fe.

This change broke the ability to "clear" or reset unfiltered back
to filtered.
上级 3b2db514
......@@ -1433,7 +1433,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
virDomainHostdevDefPtr hostdev = NULL;
char *sysfs_path = NULL;
const char *path = NULL;
bool val;
int val = -1;
int ret = -1;
/* "sgio" is only valid for block disk; cdrom
......@@ -1475,12 +1475,8 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
* whitelist is enabled. But if requesting unfiltered access, always call
* virSetDeviceUnprivSGIO, to report an error for unsupported unpriv_sgio.
*/
if (!val || !virFileExists(sysfs_path)) {
ret = 0;
goto cleanup;
}
if (virSetDeviceUnprivSGIO(path, NULL, 1) < 0)
if ((virFileExists(sysfs_path) || val == 1) &&
virSetDeviceUnprivSGIO(path, NULL, val) < 0)
goto cleanup;
ret = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册