提交 9b86bbcc 编写于 作者: J John Ferlan

util: Modify virStorageFileGetSCSIKey return

Alter the "real" code to return -2 on virCommandRun failure.
Alter the comments and function header to describe the function
and its returns.
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
ACKed-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 f136b831
...@@ -1425,8 +1425,22 @@ int virStorageFileGetLVMKey(const char *path, ...@@ -1425,8 +1425,22 @@ int virStorageFileGetLVMKey(const char *path,
#endif #endif
#ifdef WITH_UDEV #ifdef WITH_UDEV
int virStorageFileGetSCSIKey(const char *path, /* virStorageFileGetSCSIKey
char **key) * @path: Path to the SCSI device
* @key: Unique key to be returned
*
* Using a udev specific function, query the @path to get and return a
* unique @key for the caller to use.
*
* Returns:
* 0 On success, with the @key filled in or @key=NULL if the
* returned string was empty.
* -1 When WITH_UDEV is undefined and a system error is reported
* -2 When WITH_UDEV is defined, but calling virCommandRun fails
*/
int
virStorageFileGetSCSIKey(const char *path,
char **key)
{ {
int status; int status;
virCommandPtr cmd = virCommandNewArgList("/lib/udev/scsi_id", virCommandPtr cmd = virCommandNewArgList("/lib/udev/scsi_id",
...@@ -1435,7 +1449,7 @@ int virStorageFileGetSCSIKey(const char *path, ...@@ -1435,7 +1449,7 @@ int virStorageFileGetSCSIKey(const char *path,
"--device", path, "--device", path,
NULL NULL
); );
int ret = -1; int ret = -2;
*key = NULL; *key = NULL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册