External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-01 20:05:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecate lzma and lzop in favor of xz, add dep

Browse Source 
* src/qemu_driver.c: drop lzma and lzop images compression options
  as they are deprecated by xz
* libvirt.spec.in: add requires for xz/bzip2/gzip as they are needed
  to implement the compression options
This commit is contained in:
Daniel Veillard 2009-09-09 16:44:44 +02:00
parent 56ad465675
commit c5a305584f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvirt.spec.in
View File

@ -114,6 +114,10 @@ Requires: glusterfs-client >= 2.0.1
%if %{with_qemu}
# From QEMU RPMs
Requires: /usr/bin/qemu-img
# For image compression
Requires: gzip
Requires: bzip2
Requires: xz
%else
%if %{with_xen}
# From Xen RPMs

15
src/qemu_driver.c
View File

@ -3622,9 +3622,12 @@ enum qemud_save_formats {
QEMUD_SAVE_FORMAT_RAW = 0,
QEMUD_SAVE_FORMAT_GZIP = 1,
QEMUD_SAVE_FORMAT_BZIP2 = 2,
QEMUD_SAVE_FORMAT_LZMA = 3, /* deprecated, in favor of xz */
QEMUD_SAVE_FORMAT_LZOP = 4,
QEMUD_SAVE_FORMAT_XZ = 5,
/*
* Deprecated by xz and never used as part of a release
* QEMUD_SAVE_FORMAT_LZMA,
* QEMUD_SAVE_FORMAT_LZOP,
*/
QEMUD_SAVE_FORMAT_XZ = 3,
/* Note: add new members only at the end.
These values are used in the on-disk format.
Do not change or re-use numbers. */
@ -3637,8 +3640,6 @@ VIR_ENUM_IMPL(qemudSaveCompression, QEMUD_SAVE_FORMAT_LAST,
"raw",
"gzip",
"bzip2",
"lzma",
"lzop",
"xz")
struct qemud_save_header {
@ -4381,10 +4382,6 @@ static int qemudDomainRestore(virConnectPtr conn,
intermediate_argv[0] = "gzip";
else if (header.compressed == QEMUD_SAVE_FORMAT_BZIP2)
intermediate_argv[0] = "bzip2";
else if (header.compressed == QEMUD_SAVE_FORMAT_LZMA)
intermediate_argv[0] = "lzma";
else if (header.compressed == QEMUD_SAVE_FORMAT_LZOP)
intermediate_argv[0] = "lzop";
else if (header.compressed == QEMUD_SAVE_FORMAT_XZ)
intermediate_argv[0] = "xz";
else if (header.compressed != QEMUD_SAVE_FORMAT_RAW) {