[libvirt] virsh qemu-monitor-command broken with 0.9.5
Hi, the virsh qemu-monitor-command is not working with libvirt 0.9.5 with git commit 85d2810823a31634b12145d6c196930b40425370 *opts_seen moved into the != VSH_OT_ARGV if statement so now opts_seen is only set if not VSH_OT_ARGV see attached fix Regards Jason
On 09/21/2011 06:18 AM, Jason Krieg wrote:
Hi,
the virsh qemu-monitor-command is not working with libvirt 0.9.5
with git commit 85d2810823a31634b12145d6c196930b40425370
*opts_seen moved into the != VSH_OT_ARGV if statement
so now opts_seen is only set if not VSH_OT_ARGV
diff -Nurp libvirt-0.9.5/tools/virsh.c libvirt-0.9.5.new/tools/virsh.c --- libvirt-0.9.5/tools/virsh.c 2011-09-20 05:00:45.000000000 +0200 +++ libvirt-0.9.5.new/tools/virsh.c 2011-09-21 13:56:17.000000000 +0200 @@ -13916,8 +13916,8 @@ vshCmddefGetData(const vshCmdDef *cmd, u opt =&cmd->opts[i]; if (opt->type != VSH_OT_ARGV) { *opts_need_arg&= ~(1<< i); - *opts_seen |= 1<< i; } + *opts_seen |= 1<< i; return opt;
Thanks for the report, but reverting this change would break snapshot-create-as diskspec parsing. I'll have to come up with a proper fix that works with both commands. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On Wed, Sep 21, 2011 at 06:28:26AM -0600, Eric Blake wrote:
On 09/21/2011 06:18 AM, Jason Krieg wrote:
Hi,
the virsh qemu-monitor-command is not working with libvirt 0.9.5
with git commit 85d2810823a31634b12145d6c196930b40425370
*opts_seen moved into the != VSH_OT_ARGV if statement
so now opts_seen is only set if not VSH_OT_ARGV
diff -Nurp libvirt-0.9.5/tools/virsh.c libvirt-0.9.5.new/tools/virsh.c --- libvirt-0.9.5/tools/virsh.c 2011-09-20 05:00:45.000000000 +0200 +++ libvirt-0.9.5.new/tools/virsh.c 2011-09-21 13:56:17.000000000 +0200 @@ -13916,8 +13916,8 @@ vshCmddefGetData(const vshCmdDef *cmd, u opt =&cmd->opts[i]; if (opt->type != VSH_OT_ARGV) { *opts_need_arg&= ~(1<< i); - *opts_seen |= 1<< i; } + *opts_seen |= 1<< i; return opt;
Thanks for the report, but reverting this change would break snapshot-create-as diskspec parsing.
I'll have to come up with a proper fix that works with both commands.
Hands up who wants to pull all this dodgy ARGV parsing code out of virsh, and into a isolated src/util/cliparse.c module, where it can be properly unit tested without involving the rest of the virsh code... Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
于 2011年09月21日 20:28, Eric Blake 写道:
On 09/21/2011 06:18 AM, Jason Krieg wrote:
Hi,
the virsh qemu-monitor-command is not working with libvirt 0.9.5
with git commit 85d2810823a31634b12145d6c196930b40425370
So does command send-key.
*opts_seen moved into the != VSH_OT_ARGV if statement
so now opts_seen is only set if not VSH_OT_ARGV
diff -Nurp libvirt-0.9.5/tools/virsh.c libvirt-0.9.5.new/tools/virsh.c --- libvirt-0.9.5/tools/virsh.c 2011-09-20 05:00:45.000000000 +0200 +++ libvirt-0.9.5.new/tools/virsh.c 2011-09-21 13:56:17.000000000 +0200 @@ -13916,8 +13916,8 @@ vshCmddefGetData(const vshCmdDef *cmd, u opt =&cmd->opts[i]; if (opt->type != VSH_OT_ARGV) { *opts_need_arg&= ~(1<< i); - *opts_seen |= 1<< i; } + *opts_seen |= 1<< i; return opt;
Thanks for the report, but reverting this change would break snapshot-create-as diskspec parsing.
I'll have to come up with a proper fix that works with both commands.
On 09/21/2011 06:28 AM, Eric Blake wrote:
+++ libvirt-0.9.5.new/tools/virsh.c 2011-09-21 13:56:17.000000000 +0200 @@ -13916,8 +13916,8 @@ vshCmddefGetData(const vshCmdDef *cmd, u opt =&cmd->opts[i]; if (opt->type != VSH_OT_ARGV) { *opts_need_arg&= ~(1<< i); - *opts_seen |= 1<< i; } + *opts_seen |= 1<< i; return opt;
Thanks for the report, but reverting this change would break snapshot-create-as diskspec parsing.
I'll have to come up with a proper fix that works with both commands.
Got it. Unfortunately, it was a bit more than moving one line, although your patch was indeed part of my solution. Fortunately, I played nicely and enhanced the test suite, to ensure we can't regress in the future. https://www.redhat.com/archives/libvir-list/2011-September/msg00847.html -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On 09/21/2011 05:00 PM, Eric Blake wrote:
On 09/21/2011 06:28 AM, Eric Blake wrote:
+++ libvirt-0.9.5.new/tools/virsh.c 2011-09-21 13:56:17.000000000 +0200 @@ -13916,8 +13916,8 @@ vshCmddefGetData(const vshCmdDef *cmd, u opt =&cmd->opts[i]; if (opt->type != VSH_OT_ARGV) { *opts_need_arg&= ~(1<< i); - *opts_seen |= 1<< i; } + *opts_seen |= 1<< i; return opt;
Thanks for the report, but reverting this change would break snapshot-create-as diskspec parsing.
I'll have to come up with a proper fix that works with both commands.
Got it. Unfortunately, it was a bit more than moving one line, although your patch was indeed part of my solution. Fortunately, I played nicely and enhanced the test suite, to ensure we can't regress in the future. https://www.redhat.com/archives/libvir-list/2011-September/msg00847.html
nice your patch works for me 8-) compliment to the libvirt maintainers you always respond and react very fast Regards Jason
participants (4)
-
Daniel P. Berrange -
Eric Blake -
Jason Krieg -
Osier Yang