提交 9477b4a0 编写于 作者: J John Ferlan

qemu: Remove qemuCompressProgramAvailable

There's only one caller and the code is duplicitous just converting the
recently converted cfg image name back into it's string value in order to
get/find the path to the image.  A subsequent patch can return this path.
上级 48cb9f05
......@@ -3250,22 +3250,6 @@ qemuDomainSaveInternal(virQEMUDriverPtr driver, virDomainPtr dom,
return ret;
}
/* Returns true if a compression program is available in PATH */
static bool
qemuCompressProgramAvailable(virQEMUSaveFormat compress)
{
char *path;
if (compress == QEMU_SAVE_FORMAT_RAW)
return true;
if (!(path = virFindFileInPath(qemuSaveCompressionTypeToString(compress))))
return false;
VIR_FREE(path);
return true;
}
/* qemuGetCompressionProgram:
* @imageFormat: String representation from qemu.conf for the compression
......@@ -3289,6 +3273,7 @@ qemuGetCompressionProgram(const char *imageFormat,
bool use_raw_on_fail)
{
virQEMUSaveFormat ret;
char *path = NULL;
if (!imageFormat)
return QEMU_SAVE_FORMAT_RAW;
......@@ -3296,9 +3281,11 @@ qemuGetCompressionProgram(const char *imageFormat,
if ((ret = qemuSaveCompressionTypeFromString(imageFormat)) < 0)
goto error;
if (!qemuCompressProgramAvailable(ret))
if (!(path = virFindFileInPath(imageFormat)))
goto error;
VIR_FREE(path);
return ret;
error:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册