Re: [libvirt] [PATCH v3 0/3] virt-shell: v3 diff series

On 13.08.2015 13:39, Erik Skultety wrote: > v3: > - renamed virshCommandOptTimeoutToMs > - resolved conflicts caused by virsh block job handling refactor > - generic commands implementation moved to vsh.c > > As usual, for testing purposes, everything is available on my remote branch > https://github.com/eskultety/libvirt/tree/virt-shell > > > Erik Skultety (3): > virt-shell: Resolve conflicts and some forgotten substitution from v2 > virt-shell: Support command history for individual clients > virt-shell: Move generic commands implementation to vsh.c > > src/libvirt_private.syms | 1 + > src/util/virstring.c | 32 ++++ > src/util/virstring.h | 1 + > tools/virsh-domain.c | 150 +++++++++--------- > tools/virsh-network.c | 2 +- > tools/virsh.c | 390 ++++++++++++----------------------------------- > tools/virsh.h | 1 - > tools/vsh.c | 242 ++++++++++++++++++++++++++--- > tools/vsh.h | 13 +- > 9 files changed, 441 insertions(+), 391 deletions(-) > ACK with the following squashed in: diff --git a/po/POTFILES.in b/po/POTFILES.in index 1a063b6..1e52e6a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -258,7 +258,6 @@ src/xenconfig/xen_xm.c tests/virpolkittest.c tools/libvirt-guests.sh.in tools/virsh.c -tools/virsh.h tools/virsh-console.c tools/virsh-domain-monitor.c tools/virsh-domain.c diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 9707463..eca9014 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9813,7 +9813,7 @@ cmdDomrename(vshControl *ctl, const vshCmd *cmd) const char *new_name = NULL; bool ret = false; - if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) return ret; if (vshCommandOptStringReq(ctl, cmd, "new-name", &new_name) < 0) Michal -- libvir-list mailing list libvir-list(a)redhat.com https://www.redhat.com/mailman/listinfo/libvir-list