External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-26 22:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Use qemuGetCompressionProgram for error paths

Browse Source 
Let's do some more code reuse - there are 3 other callers that care to
check/get the compress program. Each of those though cares whether the
requested cfg image is valid and exists. So, add a parameter to handle
those cases.

NB: We won't need to initialize the returned value in the case where
the cfg image doesn't exist since the called program will handle that.
This commit is contained in:
John Ferlan 2016-09-13 10:11:00 -04:00
parent 4052ac2726
commit 48cb9f0542
1 changed files with 43 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
src/qemu/qemu_driver.c
View File

@ -3271,6 +3271,9 @@ qemuCompressProgramAvailable(virQEMUSaveFormat compress)
* @imageFormat: String representation from qemu.conf for the compression * @imageFormat: String representation from qemu.conf for the compression
* image format being used (dump, save, or snapshot). * image format being used (dump, save, or snapshot).
* @styleFormat: String representing the style of format (dump, save, snapshot) * @styleFormat: String representing the style of format (dump, save, snapshot)
* @use_raw_on_fail: Boolean indicating how to handle the error path. For
* callers that are OK with invalid data or inability to
* find the compression program, just return a raw format
* *
* Returns: * Returns:
* virQEMUSaveFormat - Integer representation of the compression * virQEMUSaveFormat - Integer representation of the compression
@ -3282,7 +3285,8 @@ qemuCompressProgramAvailable(virQEMUSaveFormat compress)
*/ */
static virQEMUSaveFormat static virQEMUSaveFormat
qemuGetCompressionProgram(const char *imageFormat, qemuGetCompressionProgram(const char *imageFormat,
const char *styleFormat) const char *styleFormat,
bool use_raw_on_fail)
{ {
virQEMUSaveFormat ret; virQEMUSaveFormat ret;
@ -3298,18 +3302,34 @@ qemuGetCompressionProgram(const char *imageFormat,
return ret; return ret;
error: error:
if (ret < 0) if (ret < 0) {
VIR_WARN("Invalid %s image format specified in " if (use_raw_on_fail)
"configuration file, using raw", VIR_WARN("Invalid %s image format specified in "
styleFormat); "configuration file, using raw",
else styleFormat);
VIR_WARN("Compression program for %s image format in " else
"configuration file isn't available, using raw", virReportError(VIR_ERR_OPERATION_FAILED,
styleFormat); _("Invalid %s image format specified "
"in configuration file"),
styleFormat);
} else {
if (use_raw_on_fail)
VIR_WARN("Compression program for %s image format in "
"configuration file isn't available, using raw",
styleFormat);
else
virReportError(VIR_ERR_OPERATION_FAILED,
_("Compression program for %s image format "
"in configuration file isn't available"),
styleFormat);
}
/* Use "raw" as the format if the specified format is not valid, /* Use "raw" as the format if the specified format is not valid,
* or the compress program is not available. */ * or the compress program is not available. */
return QEMU_SAVE_FORMAT_RAW; if (use_raw_on_fail)
return QEMU_SAVE_FORMAT_RAW;
return -1;
} }
@ -3318,7 +3338,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 = QEMU_SAVE_FORMAT_RAW; int compressed;
int ret = -1; int ret = -1;
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
@ -3328,21 +3348,9 @@ 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) { if ((compressed = qemuGetCompressionProgram(cfg->saveImageFormat,
compressed = qemuSaveCompressionTypeFromString(cfg->saveImageFormat); "save", false)) < 0)
if (compressed < 0) { goto cleanup;
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Invalid save image format specified "
"in configuration file"));
goto cleanup;
}
if (!qemuCompressProgramAvailable(compressed)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Compression program for image format "
"in configuration file isn't available"));
goto cleanup;
}
}
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
goto cleanup; goto cleanup;
@ -3391,7 +3399,7 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags)
{ {
virQEMUDriverPtr driver = dom->conn->privateData; virQEMUDriverPtr driver = dom->conn->privateData;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
int compressed = QEMU_SAVE_FORMAT_RAW; int compressed;
virDomainObjPtr vm; virDomainObjPtr vm;
char *name = NULL; char *name = NULL;
int ret = -1; int ret = -1;
@ -3418,21 +3426,9 @@ qemuDomainManagedSave(virDomainPtr dom, unsigned int flags)
} }
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (cfg->saveImageFormat) { if ((compressed = qemuGetCompressionProgram(cfg->saveImageFormat,
compressed = qemuSaveCompressionTypeFromString(cfg->saveImageFormat); "save", false)) < 0)
if (compressed < 0) { goto cleanup;
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Invalid save image format specified "
"in configuration file"));
goto cleanup;
}
if (!qemuCompressProgramAvailable(compressed)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Compression program for image format "
"in configuration file isn't available"));
goto cleanup;
}
}
if (!(name = qemuDomainManagedSavePath(driver, vm))) if (!(name = qemuDomainManagedSavePath(driver, vm)))
goto cleanup; goto cleanup;
@ -3593,7 +3589,7 @@ doCoreDump(virQEMUDriverPtr driver,
/* We reuse "save" flag for "dump" here. Then, we can support the same /* We reuse "save" flag for "dump" here. Then, we can support the same
* format in "save" and "dump". */ * format in "save" and "dump". */
compress = qemuGetCompressionProgram(cfg->dumpImageFormat, "dump"); compress = qemuGetCompressionProgram(cfg->dumpImageFormat, "dump", true);
/* 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) {
@ -14312,7 +14308,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */ int thaw = 0; /* 1 if freeze succeeded, -1 if freeze failed */
bool pmsuspended = false; bool pmsuspended = false;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
int compressed = QEMU_SAVE_FORMAT_RAW; int compressed;
/* If quiesce was requested, then issue a freeze command, and a /* If quiesce was requested, then issue a freeze command, and a
* counterpart thaw command when it is actually sent to agent. * counterpart thaw command when it is actually sent to agent.
@ -14373,22 +14369,9 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
JOB_MASK(QEMU_JOB_MIGRATION_OP))); JOB_MASK(QEMU_JOB_MIGRATION_OP)));
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (cfg->snapshotImageFormat) { if ((compressed = qemuGetCompressionProgram(cfg->snapshotImageFormat,
compressed = qemuSaveCompressionTypeFromString(cfg->snapshotImageFormat); "snapshot", false)) < 0)
if (compressed < 0) { goto cleanup;
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Invalid snapshot image format specified "
"in configuration file"));
goto cleanup;
}
if (!qemuCompressProgramAvailable(compressed)) {
virReportError(VIR_ERR_OPERATION_FAILED, "%s",
_("Compression program for image format "
"in configuration file isn't available"));
goto cleanup;
}
}
if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true))) if (!(xml = qemuDomainDefFormatLive(driver, vm->def, true, true)))
goto cleanup; goto cleanup;