External/libvirt
1
0
Fork 0
Code

qemu: do not set unpriv_sgio if neither supported nor requested

Browse Source 
Currently we call virSetDeviceUnprivSGIO with val == 0 if a block device
has an sgio attribute.  But for sgio='filtered', we know that a
kernel with no unpriv_sgio support will always behave as the user
wanted.  In this case, there is no need to call the function and
report a (bogus) error.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-02-25 17:38:32 +01:00 committed by Jiri Denemark
parent dce95297e3
commit 45dc3f1703
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/qemu/qemu_process.c
View File

@ -3455,36 +3455,35 @@ qemuProcessReconnectAll(virConnectPtr conn, virQEMUDriverPtr driver)
int int
qemuSetUnprivSGIO(virDomainDiskDefPtr disk) qemuSetUnprivSGIO(virDomainDiskDefPtr disk)
{ {
char *sysfs_path = NULL;
int val = -1; int val = -1;
int ret = 0;
/* "sgio" is only valid for block disk; cdrom /* "sgio" is only valid for block disk; cdrom
* and floopy disk can have empty source. * and floopy disk can have empty source.
*/ */
if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK || if (disk->type != VIR_DOMAIN_DISK_TYPE_BLOCK ||
disk->device != VIR_DOMAIN_DISK_DEVICE_LUN ||
!disk->src) !disk->src)
return 0; return 0;
if (disk->sgio) sysfs_path = virGetUnprivSGIOSysfsPath(disk->src, NULL);
val = (disk->sgio == VIR_DOMAIN_DISK_SGIO_UNFILTERED); if (sysfs_path == NULL)
/* Ignore the setting if unpriv_sgio is not supported by the
* kernel, otherwise defaults to filter the SG_IO commands,
* I.E. Set unpriv_sgio to 0.
*/
if (disk->sgio == VIR_DOMAIN_DISK_SGIO_DEFAULT &&
disk->device == VIR_DOMAIN_DISK_DEVICE_LUN) {
char *sysfs_path = NULL;
if ((sysfs_path = virGetUnprivSGIOSysfsPath(disk->src, NULL)) &&
virFileExists(sysfs_path))
val = 0;
VIR_FREE(sysfs_path);
}
if (val >= 0 && virSetDeviceUnprivSGIO(disk->src, NULL, val) < 0)
return -1; return -1;
return 0; /* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */
val = (disk->sgio == VIR_DOMAIN_DISK_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
* virSetDeviceUnprivSGIO, to report an error for unsupported unpriv_sgio.
*/
if ((virFileExists(sysfs_path) || val == 1) &&
virSetDeviceUnprivSGIO(disk->src, NULL, val) < 0)
ret = -1;
VIR_FREE(sysfs_path);
return ret;
} }
int qemuProcessStart(virConnectPtr conn, int qemuProcessStart(virConnectPtr conn,