Merge "DO NOT MERGE ANYWHERE goldfish: adjust to the refactoring of qemu-pipe"