External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_driver.c: factor out more duplication

Browse Source 
* src/qemu_driver.c (qemudDomainRestore): Use the new ...TypeToString
function here, too.
This commit is contained in:
Jim Meyering 2009-09-10 11:26:00 +02:00
parent 32456779a1
commit f238709304
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/qemu_driver.c
View File

@ -4382,21 +4382,17 @@ static int qemudDomainRestore(virConnectPtr conn,
if (header.version == 2) { if (header.version == 2) {
const char *intermediate_argv[3] = { NULL, "-dc", NULL }; const char *intermediate_argv[3] = { NULL, "-dc", NULL };
if (header.compressed == QEMUD_SAVE_FORMAT_GZIP) const char *prog = qemudSaveCompressionTypeToString(header.compressed);
intermediate_argv[0] = "gzip"; if (prog == NULL) {
else if (header.compressed == QEMUD_SAVE_FORMAT_BZIP2)
intermediate_argv[0] = "bzip2";
else if (header.compressed == QEMUD_SAVE_FORMAT_XZ)
intermediate_argv[0] = "xz";
else if (header.compressed == QEMUD_SAVE_FORMAT_LZOP)
intermediate_argv[0] = "lzop";
else if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {
qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED, qemudReportError(conn, NULL, NULL, VIR_ERR_OPERATION_FAILED,
_("Unknown compressed save format %d"), _("Invalid compressed save format %d"),
header.compressed); header.compressed);
goto cleanup; goto cleanup;
} }
if (intermediate_argv[0] != NULL) {
if (header.compressed != QEMUD_SAVE_FORMAT_RAW)
intermediate_argv[0] = prog;
else {
intermediatefd = fd; intermediatefd = fd;
fd = -1; fd = -1;
if (virExec(conn, intermediate_argv, NULL, NULL, if (virExec(conn, intermediate_argv, NULL, NULL,