RHEL 7: All qemu-kvm in RHEL 7 supports discard of qcow2 (RHBZ#1225467).

For rationale behind this, see:

  https://bugzilla.redhat.com/show_bug.cgi?id=1225467#c2
This commit is contained in:
Richard W.M. Jones
2015-05-27 10:03:00 -04:00
committed by Pino Toscano
parent 67bce50717
commit e652aa29e6

View File

@@ -988,10 +988,6 @@ guestfs_int_discard_possible (guestfs_h *g, struct drive *drv,
* discard option on -drive at all.
*/
bool qemu15 = guestfs_int_version_ge (qemu_version, 1, 5, 0);
/* qemu >= 1.6. This was the first version that supported unmap on
* qcow2 backing files.
*/
bool qemu16 = guestfs_int_version_ge (qemu_version, 1, 6, 0);
if (!qemu15)
NOT_SUPPORTED (g, false,
@@ -1016,12 +1012,8 @@ guestfs_int_discard_possible (guestfs_h *g, struct drive *drv,
}
else if (STREQ (drv->src.format, "raw"))
/* OK */ ;
else if (STREQ (drv->src.format, "qcow2")) {
if (!qemu16)
NOT_SUPPORTED (g, false,
_("discard cannot be enabled on this drive: "
"qemu < 1.6 cannot do discard on qcow2 files"));
}
else if (STREQ (drv->src.format, "qcow2"))
/* OK */ ;
else {
/* It's possible in future other formats will support discard, but
* currently (qemu 1.7) none of them do.