|
 |
7a3408 |
From d89912ddf6007ce5b8c3abef835b087dd5bfe359 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <d89912ddf6007ce5b8c3abef835b087dd5bfe359@dist-git>
|
|
|
7a3408 |
From: John Ferlan <jferlan@redhat.com>
|
|
|
7a3408 |
Date: Thu, 9 Jul 2015 08:28:55 -0400
|
|
|
7a3408 |
Subject: [PATCH] qemu: Refactor qemuSetUnprivSGIO return values
|
|
|
7a3408 |
|
|
|
7a3408 |
https://bugzilla.redhat.com/show_bug.cgi?id=1072736
|
|
|
7a3408 |
|
|
|
7a3408 |
Set to ret = -1 and prove otherwise, like usual
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
7a3408 |
(cherry picked from commit 931ac3cdb571b01968adc87bfddead67311677c2)
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/qemu/qemu_conf.c | 12 +++++-------
|
|
|
7a3408 |
1 file changed, 5 insertions(+), 7 deletions(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
|
|
|
7a3408 |
index cc40dcb..d41f166 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_conf.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_conf.c
|
|
|
7a3408 |
@@ -1434,7 +1434,7 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
|
|
7a3408 |
char *sysfs_path = NULL;
|
|
|
7a3408 |
const char *path = NULL;
|
|
|
7a3408 |
int val = -1;
|
|
|
7a3408 |
- int ret = 0;
|
|
|
7a3408 |
+ int ret = -1;
|
|
|
7a3408 |
|
|
|
7a3408 |
/* "sgio" is only valid for block disk; cdrom
|
|
|
7a3408 |
* and floopy disk can have empty source.
|
|
|
7a3408 |
@@ -1457,7 +1457,6 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
|
|
7a3408 |
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
|
|
|
7a3408 |
_("'sgio' is not supported for SCSI "
|
|
|
7a3408 |
"generic device yet "));
|
|
|
7a3408 |
- ret = -1;
|
|
|
7a3408 |
goto cleanup;
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
@@ -1466,11 +1465,8 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
|
|
7a3408 |
return 0;
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
- sysfs_path = virGetUnprivSGIOSysfsPath(path, NULL);
|
|
|
7a3408 |
- if (sysfs_path == NULL) {
|
|
|
7a3408 |
- ret = -1;
|
|
|
7a3408 |
+ if (!(sysfs_path = virGetUnprivSGIOSysfsPath(path, NULL)))
|
|
|
7a3408 |
goto cleanup;
|
|
|
7a3408 |
- }
|
|
|
7a3408 |
|
|
|
7a3408 |
/* By default, filter the SG_IO commands, i.e. set unpriv_sgio to 0. */
|
|
|
7a3408 |
val = (disk->sgio == VIR_DOMAIN_DEVICE_SGIO_UNFILTERED);
|
|
|
7a3408 |
@@ -1481,7 +1477,9 @@ qemuSetUnprivSGIO(virDomainDeviceDefPtr dev)
|
|
|
7a3408 |
*/
|
|
|
7a3408 |
if ((virFileExists(sysfs_path) || val == 1) &&
|
|
|
7a3408 |
virSetDeviceUnprivSGIO(path, NULL, val) < 0)
|
|
|
7a3408 |
- ret = -1;
|
|
|
7a3408 |
+ goto cleanup;
|
|
|
7a3408 |
+
|
|
|
7a3408 |
+ ret = 0;
|
|
|
7a3408 |
|
|
|
7a3408 |
cleanup:
|
|
|
7a3408 |
VIR_FREE(sysfs_path);
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.1
|
|
|
7a3408 |
|