summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGreg Kurz <groug@kaod.org>2017-05-02 16:41:43 +0200
committerMarkus Armbruster <armbru@redhat.com>2017-05-23 13:28:17 +0200
commitfe2f74af2b153719fa545ffa7e7a33342d9c928b (patch)
tree5e2a355d06a339c41d7c7938ee6c9759aaa709b6
parent56821559f0ba682fe6b367815572e6f974d329ab (diff)
downloadfocaccia-qemu-fe2f74af2b153719fa545ffa7e7a33342d9c928b.tar.gz
focaccia-qemu-fe2f74af2b153719fa545ffa7e7a33342d9c928b.zip
scripts/qmp/qom-set: fix the value argument passed to srv.command()
When invoking the script with -s, we end up passing a bogus value
to QEMU:

$ ./scripts/qmp/qom-set -s /var/tmp/qmp-sock-exp /machine.accel kvm
{}
$ ./scripts/qmp/qom-get -s /var/tmp/qmp-sock-exp /machine.accel
/var/tmp/qmp-sock-exp

This happens because sys.argv[2] isn't necessarily the command line
argument that holds the value. It is sys.argv[4] when -s was also
passed.

Actually, the code already has a variable to handle that. This patch
simply uses it.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <149373610338.5144.9635049015143453288.stgit@bahia.lan>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
-rwxr-xr-xscripts/qmp/qom-set2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set
index 54ecfecc53..94e2778922 100755
--- a/scripts/qmp/qom-set
+++ b/scripts/qmp/qom-set
@@ -61,4 +61,4 @@ else:
 srv = QEMUMonitorProtocol(socket_path)
 srv.connect()
 
-print srv.command('qom-set', path=path, property=prop, value=sys.argv[2])
+print srv.command('qom-set', path=path, property=prop, value=value)