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

qemu: Adjust doCoreDump to call getCompressionType

Rather than calling getCompressionType from each of the callers, just call
it from doCoreDump.  A subsequent patch will be adjust the code even more.
上级 abaa86f9
...@@ -3568,7 +3568,6 @@ static int ...@@ -3568,7 +3568,6 @@ static int
doCoreDump(virQEMUDriverPtr driver, doCoreDump(virQEMUDriverPtr driver,
virDomainObjPtr vm, virDomainObjPtr vm,
const char *path, const char *path,
virQEMUSaveFormat compress,
unsigned int dump_flags, unsigned int dump_flags,
unsigned int dumpformat) unsigned int dumpformat)
{ {
...@@ -3578,6 +3577,7 @@ doCoreDump(virQEMUDriverPtr driver, ...@@ -3578,6 +3577,7 @@ doCoreDump(virQEMUDriverPtr driver,
int directFlag = 0; int directFlag = 0;
unsigned int flags = VIR_FILE_WRAPPER_NON_BLOCKING; unsigned int flags = VIR_FILE_WRAPPER_NON_BLOCKING;
const char *memory_dump_format = NULL; const char *memory_dump_format = NULL;
virQEMUSaveFormat compress = getCompressionType(driver);
/* Create an empty file with appropriate ownership. */ /* Create an empty file with appropriate ownership. */
if (dump_flags & VIR_DUMP_BYPASS_CACHE) { if (dump_flags & VIR_DUMP_BYPASS_CACHE) {
...@@ -3704,9 +3704,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, ...@@ -3704,9 +3704,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom,
} }
} }
ret = doCoreDump(driver, vm, path, getCompressionType(driver), flags, if ((ret = doCoreDump(driver, vm, path, flags, dumpformat)) < 0)
dumpformat);
if (ret < 0)
goto endjob; goto endjob;
paused = true; paused = true;
...@@ -3911,10 +3909,8 @@ processWatchdogEvent(virQEMUDriverPtr driver, ...@@ -3911,10 +3909,8 @@ processWatchdogEvent(virQEMUDriverPtr driver,
} }
flags |= cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0; flags |= cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0;
ret = doCoreDump(driver, vm, dumpfile, if ((ret = doCoreDump(driver, vm, dumpfile, flags,
getCompressionType(driver), flags, VIR_DOMAIN_CORE_DUMP_FORMAT_RAW)) < 0)
VIR_DOMAIN_CORE_DUMP_FORMAT_RAW);
if (ret < 0)
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
"%s", _("Dump failed")); "%s", _("Dump failed"));
...@@ -3951,10 +3947,8 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver, ...@@ -3951,10 +3947,8 @@ doCoreDumpToAutoDumpPath(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
flags |= cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0; flags |= cfg->autoDumpBypassCache ? VIR_DUMP_BYPASS_CACHE: 0;
ret = doCoreDump(driver, vm, dumpfile, if ((ret = doCoreDump(driver, vm, dumpfile, flags,
getCompressionType(driver), flags, VIR_DOMAIN_CORE_DUMP_FORMAT_RAW)) < 0)
VIR_DOMAIN_CORE_DUMP_FORMAT_RAW);
if (ret < 0)
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
"%s", _("Dump failed")); "%s", _("Dump failed"));
cleanup: cleanup:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册