Vladimir Sementsov-Ogievskiy 618af89e55 block: simplify handling of try to merge different sized bitmaps ... We have too much logic to simply check that bitmaps are of the same size. Let's just define that hbitmap_merge() and bdrv_dirty_bitmap_merge_internal() require their argument bitmaps be of same size, this simplifies things. Let's look through the callers: For backup_init_bcs_bitmap() we already assert that merge can't fail. In bdrv_reclaim_dirty_bitmap_locked() we gracefully handle the error that can't happen: successor always has same size as its parent, drop this logic. In bdrv_merge_dirty_bitmap() we already has assertion and separate check. Make the check explicit and improve error message. Signed-off-by: Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru> Reviewed-by: Nikita Lapshin <nikita.lapshin@virtuozzo.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Message-Id: <20220517111206.23585-4-v.sementsov-og@mail.ru> Signed-off-by: Kevin Wolf <kwolf@redhat.com>		2022-06-24 17:07:06 +02:00
..
accel.h	accel-cpu: make cpu_realizefn return a bool	2021-05-10 15:41:50 -04:00
atomic128.h	docs: fix references to docs/devel/atomics.rst	2021-06-02 06:51:09 +02:00
atomic.h	Use QEMU_SANITIZE_THREAD	2022-05-03 15:16:21 +04:00
base64.h
bcd.h
bitmap.h
bitops.h	bitops.h: revert db1ffc32dd ("qemu/bitops.h: add bitrev8 implementation")	2021-07-26 06:56:41 -10:00
bswap.h	Move CPU softfloat unions to cpu-float.h	2022-04-06 14:31:43 +02:00
buffer.h	Replace GCC_FMT_ATTR with G_GNUC_PRINTF	2022-03-22 14:40:51 +04:00
cacheflush.h	util: Enhance flush_icache_range with separate data pointer	2021-01-07 05:09:41 -10:00
cacheinfo.h	include: Move qemu_[id]cache_* declarations to new qemu/cacheinfo.h	2022-02-21 13:30:20 +00:00
co-shared-resource.h	co-shared-resource: protect with a mutex	2021-06-25 14:24:24 +03:00
compiler.h	compiler.h: add QEMU_SANITIZE_{ADDRESS,THREAD}	2022-04-21 17:08:52 +04:00
config-file.h	remove -writeconfig	2022-04-28 08:51:56 +02:00
coroutine_int.h
coroutine-tls.h	tls: add macros for coroutine-safe TLS variables	2022-03-04 18:14:40 +01:00
coroutine.h	* small cleanups for pc-bios/optionrom Makefiles	2022-05-12 10:52:15 -07:00
cpu-float.h	Clean up ill-advised or unusual header guards	2022-05-11 16:50:01 +02:00
cpuid.h	tcg/i386: Detect AVX512	2022-03-04 08:50:41 -10:00
crc32c.h
crc-ccitt.h	Clean up ill-advised or unusual header guards	2022-05-11 16:50:01 +02:00
ctype.h
cutils.h	cutils: add functions for IEC and SI prefixes	2022-06-14 16:50:30 +02:00
datadir.h
dbus.h	ui/dbus: add chardev backend & interface	2021-12-21 10:50:22 +04:00
drm.h
envlist.h
error-report.h	Move error_printf_unless_qmp() with monitor unit	2022-04-21 17:09:09 +04:00
event_notifier.h	event_notifier: add event_notifier_get_wfd()	2022-03-06 06:19:47 -05:00
fifo8.h	utils/fifo8: add VMSTATE_FIFO8_TEST macro	2021-02-07 20:38:34 +00:00
fifo32.h
filemonitor.h
futex.h
guest-random.h
hbitmap.h	block: simplify handling of try to merge different sized bitmaps	2022-06-24 17:07:06 +02:00
help_option.h
help-texts.h	Clean up header guards that don't match their file name	2022-05-11 16:49:06 +02:00
host-utils.h	host-utils: Implemented signed 256-by-128 division	2022-06-20 08:38:58 -03:00
hw-version.h	include: Move hardware version declarations to new qemu/hw-version.h	2022-02-21 13:30:20 +00:00
id.h	net: Use id_generate() in the network subsystem, too	2021-03-09 21:47:45 +01:00
int128.h	host-utils: Implemented unsigned 256-by-128 division	2022-06-20 08:38:58 -03:00
iov.h	util/iov: make qemu_iovec_init_extended() honest	2021-02-03 08:00:33 -06:00
iova-tree.h	util: add iova_tree_find_iova	2022-03-15 13:57:44 +08:00
jhash.h
job.h	job.h: split function pointers in JobDriver	2022-03-04 18:18:26 +01:00
keyval.h	Clean up ill-advised or unusual header guards	2022-05-11 16:50:01 +02:00
lockable.h	include/qemu/lockable: Use _Generic instead of QEMU_GENERIC	2021-06-16 15:03:26 +02:00
log-for-trace.h	util/log: Drop return value from qemu_log	2022-04-20 10:51:11 -07:00
log.h	util/log: Support per-thread log files	2022-04-20 10:51:11 -07:00
madvise.h	include: Move qemu_madvise() and related #defines to new qemu/madvise.h	2022-02-21 13:30:20 +00:00
main-loop.h	util/main-loop: Introduce the main loop into QOM	2022-05-09 10:43:23 +01:00
memalign.h	osdep: Move memalign-related functions to their own header	2022-03-07 13:16:49 +00:00
memfd.h
mmap-alloc.h	include: Move QEMU_MAP_* constants to mmap-alloc.h	2022-02-21 13:30:20 +00:00
module.h	modules: introduces module_kconfig directive	2022-06-06 09:26:53 +02:00
mprotect.h	include: Move qemu_mprotect_*() to new qemu/mprotect.h	2022-02-21 13:30:20 +00:00
notify.h
nvdimm-utils.h
option_int.h
option.h	include: add qemu/keyval.h	2022-04-21 17:03:51 +04:00
osdep.h	include: move qemu_*_exec_dir() to cutils	2022-05-28 11:42:56 +02:00
path.h
plugin-memory.h	Clean up decorations and whitespace around header guards	2022-05-11 16:50:32 +02:00
plugin.h	plugins: try and make plugin_insn_append more ergonomic	2021-11-04 10:32:01 +00:00
pmem.h
processor.h
progress_meter.h	progressmeter: protect with a mutex	2021-06-25 14:24:24 +03:00
qdist.h
qemu-options.h	remove qemu-options* from root directory	2021-05-26 14:49:46 +02:00
qemu-plugin.h	Clean up header guards that don't match their file name	2022-05-11 16:49:06 +02:00
qemu-print.h	Replace GCC_FMT_ATTR with G_GNUC_PRINTF	2022-03-22 14:40:51 +04:00
qemu-progress.h	include: move progress API to qemu-progress.h	2022-04-06 14:31:43 +02:00
qht.h
qsp.h
queue.h
range.h	compiler.h: replace QEMU_WARN_UNUSED_RESULT with G_GNUC_WARN_UNUSED_RESULT	2022-03-22 14:40:51 +04:00
ratelimit.h	ratelimit: treat zero speed as unlimited	2021-06-25 14:22:21 +03:00
rcu_queue.h
rcu.h	rcu: use coroutine TLS macros	2022-03-04 18:14:40 +01:00
readline.h	Replace GCC_FMT_ATTR with G_GNUC_PRINTF	2022-03-22 14:40:51 +04:00
selfmap.h	Clean up decorations and whitespace around header guards	2022-05-11 16:50:32 +02:00
seqlock.h
sockets.h	util: rename qemu_*block() socket functions	2022-05-03 15:53:20 +04:00
stats64.h	qemu/atomic: Add aligned_{int64,uint64}_t types	2021-07-21 07:45:38 -10:00
sys_membarrier.h
systemd.h
thread-posix.h	thread-posix: implement Semaphore with QemuCond and QemuMutex	2022-04-06 14:31:56 +02:00
thread-win32.h	util: Use real functions for thread-posix QemuRecMutex	2021-06-16 15:03:26 +02:00
thread.h	compiler.h: replace QEMU_NORETURN with G_NORETURN	2022-04-21 17:03:51 +04:00
throttle-options.h
throttle.h
timed-average.h
timer.h	Use g_new() & friends where that makes obvious sense	2022-03-21 15:44:44 +01:00
transactions.h	transactions: Invoke clean() after everything else	2021-11-16 09:43:44 +01:00
tsan.h
typedefs.h	virtio,pc,pci: features, cleanups, fixes	2022-03-08 22:27:34 +00:00
unicode.h
units.h
uri.h
userfaultfd.h	migration: introduce UFFD-WP low-level interface helpers	2021-02-08 11:19:51 +00:00
uuid.h
vfio-helpers.h	util/vfio-helpers: Pass Error handle to qemu_vfio_dma_map()	2021-09-07 09:08:24 +01:00
vhost-user-server.h	block/export: Fix vhost-user-blk shutdown with requests in flight	2022-02-01 13:49:15 +01:00
win_dump_defs.h	include/qemu: add 32-bit Windows dump structures	2022-04-22 13:36:04 +04:00
xattr.h	9p: linux: Fix a couple Linux assumptions	2022-03-07 11:49:30 +01:00
xxhash.h	target/arm: Implement an IMPDEF pauth algorithm	2021-01-19 14:38:51 +00:00
yank.h	yank: Remove dependency on qiochannel	2021-04-01 15:27:44 +04:00