You need to sign in or sign up before continuing.
提交 f2b0a533 编写于 作者: P Peter Krempa

qemu: Fix coding style in qemuDomainSaveFlags()

Avoid mixed brace style in an if statement and fix formatting of error
messages.
上级 3f029fb5
...@@ -3158,7 +3158,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, ...@@ -3158,7 +3158,7 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml,
unsigned int flags) unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
int compressed; int compressed = QEMU_SAVE_FORMAT_RAW;
int ret = -1; int ret = -1;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
...@@ -3168,19 +3168,17 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml, ...@@ -3168,19 +3168,17 @@ qemuDomainSaveFlags(virDomainPtr dom, const char *path, const char *dxml,
VIR_DOMAIN_SAVE_PAUSED, -1); VIR_DOMAIN_SAVE_PAUSED, -1);
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (cfg->saveImageFormat == NULL) if (cfg->saveImageFormat) {
compressed = QEMU_SAVE_FORMAT_RAW;
else {
compressed = qemuSaveCompressionTypeFromString(cfg->saveImageFormat); compressed = qemuSaveCompressionTypeFromString(cfg->saveImageFormat);
if (compressed < 0) { if (compressed < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED, "%s",
"%s", _("Invalid save image format specified " _("Invalid save image format specified "
"in configuration file")); "in configuration file"));
goto cleanup; goto cleanup;
} }
if (!qemuCompressProgramAvailable(compressed)) { if (!qemuCompressProgramAvailable(compressed)) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED, "%s",
"%s", _("Compression program for image format " _("Compression program for image format "
"in configuration file isn't available")); "in configuration file isn't available"));
goto cleanup; goto cleanup;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册