qemu:dep fix and split