]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Use -machine when probing capabilities via QMP
authorJiri Denemark <jdenemar@redhat.com>
Fri, 11 Nov 2016 21:56:52 +0000 (22:56 +0100)
committerJiri Denemark <jdenemar@redhat.com>
Fri, 25 Nov 2016 19:34:26 +0000 (20:34 +0100)
Using -machine instead of -M for QMP probing is safe because any QEMU
binary which is capable of QMP probing supports -machine.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
src/qemu/qemu_capabilities.c

index 5a6d15f10037128390a883e1fda3d83de9109ae6..62764b8c39f34e512c0997484955526434cda4ac 100644 (file)
@@ -4168,7 +4168,7 @@ virQEMUCapsInitQMPCommandRun(virQEMUCapsInitQMPCommandPtr cmd)
                                     "-no-user-config",
                                     "-nodefaults",
                                     "-nographic",
-                                    "-M", "none",
+                                    "-machine", "none",
                                     "-qmp", cmd->monarg,
                                     "-pidfile", cmd->pidfile,
                                     "-daemonize",