[PATCH v2 1/2] qemu: Revert to using non-JSON commandline for -device