On 07/05/2018 02:55 PM, Eric Blake wrote: > On 07/05/2018 01:51 PM, John Snow wrote: > >> >>> - assert(!bdrv_dirty_bitmap_readonly(dest)); >>> - >>> - if (!hbitmap_merge(dest->bitmap, src->bitmap)) { >>> - error_setg(errp, "Bitmaps are incompatible and can't be >>> merged"); >>> + if (bdrv_can_merge_dirty_bitmap(dest, src, errp)) { >>> + bool ret = hbitmap_merge(dest->bitmap, src->bitmap); >>> + assert(ret); >> >> Might as well just assert(hbitmap_merge(...)); > > Except that side effects inside assert() are bad programming practice, > even if in qemu assert()s are guaranteed to always be enabled by osdep.h. > Oh, good point. NEVERMIND!
- [Qemu-devel] [PATCH 0/2] transaction support ... Vladimir Sementsov-Ogievskiy
- [Qemu-devel] [PATCH 1/2] drity-bitmap: r... Vladimir Sementsov-Ogievskiy
- Re: [Qemu-devel] [PATCH 1/2] drity-b... Eric Blake
- Re: [Qemu-devel] [PATCH 1/2] drity-b... John Snow
- Re: [Qemu-devel] [PATCH 1/2] dri... Eric Blake
- Re: [Qemu-devel] [PATCH 1/2]... John Snow
- [Qemu-devel] [PATCH 2/2] qapi: add trans... Vladimir Sementsov-Ogievskiy
- Re: [Qemu-devel] [PATCH 2/2] qapi: a... Eric Blake
- Re: [Qemu-devel] [PATCH 2/2] qapi: a... John Snow
- Re: [Qemu-devel] [PATCH 2/2] qap... Vladimir Sementsov-Ogievskiy
- Re: [Qemu-devel] [PATCH 2/2]... John Snow
- Re: [Qemu-devel] [PATCH... Vladimir Sementsov-Ogievskiy
- Re: [Qemu-devel] [PATCH... Eric Blake