Sync upstream and add guestfish_block_dev