On 17.09.2015 15:48, Kevin Wolf wrote: > After bdrv_swap(), some fields must be moved back to their original BDS > to compensate for the effects that a swap of the contents of the objects > has while keeping the old addresses. Other fields must be moved back > because they should logically be moved and must stay on top > > When replacing bdrv_swap() with operations changing the pointers in the > parents, we only need the latter and must avoid swapping the former. > Split the function accordingly. > > Signed-off-by: Kevin Wolf > --- > block.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) Reviewed-by: Max Reitz (and an ACK to "Op blockers are a mess.")