[PATCH 0/2] qemu: Fix two checkpoint redefine issues