On Mon 04 Nov 2019 04:07:35 PM CET, Max Reitz wrote: >> /* First remove L2 entries */ >> qcow2_cache_entry_mark_dirty(s->l2_table_cache, l2_slice); >> - if (!full_discard && s->qcow_version >= 3) { >> + if (has_subclusters(s)) { >> + set_l2_entry(s, l2_slice, l2_index + i, 0); >> + set_l2_bitmap(s, l2_slice, l2_index + i, >> + full_discard ? 0 : QCOW_L2_BITMAP_ALL_ZEROES); > > But only for !full_discard, right?
Hence the conditional operator in my patch, maybe you didn't see it? Berto