Don't accumulate helpers in virsh.c --- tools/Makefile.am | 1 + tools/virsh-domain-monitor.c | 1 + tools/virsh-domain.c | 1 + tools/virsh-util.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-util.h | 35 +++++++++++++++++++++++ tools/virsh-volume.c | 1 + tools/virsh.c | 41 --------------------------- tools/virsh.h | 4 --- 8 files changed, 105 insertions(+), 45 deletions(-) create mode 100644 tools/virsh-util.c create mode 100644 tools/virsh-util.h diff --git a/tools/Makefile.am b/tools/Makefile.am index bfacaf214..56691c289 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -226,6 +226,7 @@ virsh_SOURCES = \ virsh-pool.c virsh-pool.h \ virsh-secret.c virsh-secret.h \ virsh-snapshot.c virsh-snapshot.h \ + virsh-util.c virsh-util.h \ virsh-volume.c virsh-volume.h \ $(NULL) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 901a6ebef..4ade5651c 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -25,6 +25,7 @@ #include <config.h> #include "virsh-domain-monitor.h" +#include "virsh-util.h" #include <libxml/parser.h> #include <libxml/tree.h> diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4b6c13ce4..7db74fecf 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -25,6 +25,7 @@ #include <config.h> #include "virsh-domain.h" +#include "virsh-util.h" #include <fcntl.h> #include <poll.h> diff --git a/tools/virsh-util.c b/tools/virsh-util.c new file mode 100644 index 000000000..98f16ff1a --- /dev/null +++ b/tools/virsh-util.c @@ -0,0 +1,66 @@ +/* + * virsh-util.c: helpers for virsh + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#include <config.h> + +#include "virsh-util.h" + +#include "virfile.h" + +int +virshDomainState(vshControl *ctl, + virDomainPtr dom, + int *reason) +{ + virDomainInfo info; + virshControlPtr priv = ctl->privData; + + if (reason) + *reason = -1; + + if (!priv->useGetInfo) { + int state; + if (virDomainGetState(dom, &state, reason, 0) < 0) { + virErrorPtr err = virGetLastError(); + if (err && err->code == VIR_ERR_NO_SUPPORT) + priv->useGetInfo = true; + else + return -1; + } else { + return state; + } + } + + /* fall back to virDomainGetInfo if virDomainGetState is not supported */ + if (virDomainGetInfo(dom, &info) < 0) + return -1; + else + return info.state; +} + + +int +virshStreamSink(virStreamPtr st ATTRIBUTE_UNUSED, + const char *bytes, + size_t nbytes, + void *opaque) +{ + int *fd = opaque; + + return safewrite(*fd, bytes, nbytes); +} diff --git a/tools/virsh-util.h b/tools/virsh-util.h new file mode 100644 index 000000000..207d57859 --- /dev/null +++ b/tools/virsh-util.h @@ -0,0 +1,35 @@ +/* + * virsh-util.h: helpers for virsh + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + */ + +#ifndef VIRSH_UTIL_H +# define VIRSH_UTIL_H + +# include "virsh.h" + +int +virshDomainState(vshControl *ctl, + virDomainPtr dom, + int *reason); + +int +virshStreamSink(virStreamPtr st, + const char *bytes, + size_t nbytes, + void *opaque); + +#endif /* VIRSH_UTIL_H */ diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 32ffb8149..ddd41d229 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -25,6 +25,7 @@ #include <config.h> #include "virsh-volume.h" +#include "virsh-util.h" #include <fcntl.h> diff --git a/tools/virsh.c b/tools/virsh.c index 7eb51ab7d..31e23bd27 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -257,14 +257,6 @@ virshReconnect(vshControl *ctl, const char *name, bool readonly, bool force) return 0; } -int virshStreamSink(virStreamPtr st ATTRIBUTE_UNUSED, - const char *bytes, size_t nbytes, void *opaque) -{ - int *fd = opaque; - - return safewrite(*fd, bytes, nbytes); -} - /* --------------- * Command Connect * --------------- @@ -347,39 +339,6 @@ virshConnectionHandler(vshControl *ctl) } -/* --------------- - * Misc utils - * --------------- - */ -int -virshDomainState(vshControl *ctl, virDomainPtr dom, int *reason) -{ - virDomainInfo info; - virshControlPtr priv = ctl->privData; - - if (reason) - *reason = -1; - - if (!priv->useGetInfo) { - int state; - if (virDomainGetState(dom, &state, reason, 0) < 0) { - virErrorPtr err = virGetLastError(); - if (err && err->code == VIR_ERR_NO_SUPPORT) - priv->useGetInfo = true; - else - return -1; - } else { - return state; - } - } - - /* fall back to virDomainGetInfo if virDomainGetState is not supported */ - if (virDomainGetInfo(dom, &info) < 0) - return -1; - else - return info.state; -} - /* * Initialize connection. */ diff --git a/tools/virsh.h b/tools/virsh.h index fd552bb3a..9e42ef9bb 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -145,9 +145,5 @@ typedef enum { } virshLookupByFlags; virConnectPtr virshConnect(vshControl *ctl, const char *uri, bool readonly); -int virshDomainState(vshControl *ctl, virDomainPtr dom, int *reason); - -int virshStreamSink(virStreamPtr st, const char *bytes, size_t nbytes, - void *opaque); #endif /* VIRSH_H */ -- 2.12.2

Move virshLookupDomainBy, virshCommandOptDomainBy and virshCommandOptDomainBy to the helper file. Additionally turn the virshCommandOptDomainBy macro into a function. --- po/POTFILES.in | 1 + tools/virsh-domain-monitor.c | 1 - tools/virsh-domain.c | 71 ------------------------------------ tools/virsh-domain.h | 12 ------- tools/virsh-host.c | 1 - tools/virsh-snapshot.c | 2 +- tools/virsh-util.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-util.h | 17 +++++++++ 8 files changed, 105 insertions(+), 86 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 064abd5bb..ccef6f3cf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -310,6 +310,7 @@ tools/virsh-nwfilter.c tools/virsh-pool.c tools/virsh-secret.c tools/virsh-snapshot.c +tools/virsh-util.c tools/virsh-volume.c tools/virsh.c tools/virt-admin.c diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 4ade5651c..5215ac6f9 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -37,7 +37,6 @@ #include "intprops.h" #include "viralloc.h" #include "virmacaddr.h" -#include "virsh-domain.h" #include "virxml.h" #include "virstring.h" diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 7db74fecf..4e4df5b4f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -83,77 +83,6 @@ #define VIRSH_COMMON_OPT_DOMAIN_CURRENT \ VIRSH_COMMON_OPT_CURRENT(N_("affect current domain")) \ -static virDomainPtr -virshLookupDomainInternal(vshControl *ctl, - const char *cmdname, - const char *name, - unsigned int flags) -{ - virDomainPtr dom = NULL; - int id; - virCheckFlags(VIRSH_BYID | VIRSH_BYUUID | VIRSH_BYNAME, NULL); - virshControlPtr priv = ctl->privData; - - /* try it by ID */ - if (flags & VIRSH_BYID) { - if (virStrToLong_i(name, NULL, 10, &id) == 0 && id >= 0) { - vshDebug(ctl, VSH_ERR_DEBUG, "%s: <domain> looks like ID\n", - cmdname); - dom = virDomainLookupByID(priv->conn, id); - } - } - - /* try it by UUID */ - if (!dom && (flags & VIRSH_BYUUID) && - strlen(name) == VIR_UUID_STRING_BUFLEN-1) { - vshDebug(ctl, VSH_ERR_DEBUG, "%s: <domain> trying as domain UUID\n", - cmdname); - dom = virDomainLookupByUUIDString(priv->conn, name); - } - - /* try it by NAME */ - if (!dom && (flags & VIRSH_BYNAME)) { - vshDebug(ctl, VSH_ERR_DEBUG, "%s: <domain> trying as domain NAME\n", - cmdname); - dom = virDomainLookupByName(priv->conn, name); - } - - vshResetLibvirtError(); - - if (!dom) - vshError(ctl, _("failed to get domain '%s'"), name); - - return dom; -} - - -virDomainPtr -virshLookupDomainBy(vshControl *ctl, - const char *name, - unsigned int flags) -{ - return virshLookupDomainInternal(ctl, "unknown", name, flags); -} - - -virDomainPtr -virshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, - const char **name, unsigned int flags) -{ - const char *n = NULL; - const char *optname = "domain"; - - if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) - return NULL; - - vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n", - cmd->def->name, optname, n); - - if (name) - *name = n; - - return virshLookupDomainInternal(ctl, cmd->def->name, n, flags); -} static virDomainPtr virshDomainDefine(virConnectPtr conn, const char *xml, unsigned int flags) diff --git a/tools/virsh-domain.h b/tools/virsh-domain.h index 462f560f9..3f9d12a5f 100644 --- a/tools/virsh-domain.h +++ b/tools/virsh-domain.h @@ -28,18 +28,6 @@ # include "virsh.h" -virDomainPtr virshLookupDomainBy(vshControl *ctl, - const char *name, - unsigned int flags); - -virDomainPtr virshCommandOptDomainBy(vshControl *ctl, const vshCmd *cmd, - const char **name, unsigned int flags); - -/* default is lookup by Id, Name and UUID */ -# define virshCommandOptDomain(_ctl, _cmd, _name) \ - virshCommandOptDomainBy(_ctl, _cmd, _name, \ - VIRSH_BYID | VIRSH_BYUUID | VIRSH_BYNAME) - extern const vshCmdDef domManagementCmds[]; #endif /* VIRSH_DOMAIN_H */ diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 3b86c75fa..5509065fd 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -35,7 +35,6 @@ #include "virbitmap.h" #include "virbuffer.h" #include "viralloc.h" -#include "virsh-domain.h" #include "virxml.h" #include "virtypedparam.h" #include "virstring.h" diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 5c844a5ea..46e2cbb24 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -37,7 +37,7 @@ #include "virbuffer.h" #include "viralloc.h" #include "virfile.h" -#include "virsh-domain.h" +#include "virsh-util.h" #include "virstring.h" #include "virxml.h" #include "conf/snapshot_conf.h" diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 98f16ff1a..5c99655fb 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -21,6 +21,92 @@ #include "virsh-util.h" #include "virfile.h" +#include "virstring.h" + +static virDomainPtr +virshLookupDomainInternal(vshControl *ctl, + const char *cmdname, + const char *name, + unsigned int flags) +{ + virDomainPtr dom = NULL; + int id; + virCheckFlags(VIRSH_BYID | VIRSH_BYUUID | VIRSH_BYNAME, NULL); + virshControlPtr priv = ctl->privData; + + /* try it by ID */ + if (flags & VIRSH_BYID) { + if (virStrToLong_i(name, NULL, 10, &id) == 0 && id >= 0) { + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <domain> looks like ID\n", + cmdname); + dom = virDomainLookupByID(priv->conn, id); + } + } + + /* try it by UUID */ + if (!dom && (flags & VIRSH_BYUUID) && + strlen(name) == VIR_UUID_STRING_BUFLEN-1) { + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <domain> trying as domain UUID\n", + cmdname); + dom = virDomainLookupByUUIDString(priv->conn, name); + } + + /* try it by NAME */ + if (!dom && (flags & VIRSH_BYNAME)) { + vshDebug(ctl, VSH_ERR_DEBUG, "%s: <domain> trying as domain NAME\n", + cmdname); + dom = virDomainLookupByName(priv->conn, name); + } + + vshResetLibvirtError(); + + if (!dom) + vshError(ctl, _("failed to get domain '%s'"), name); + + return dom; +} + + +virDomainPtr +virshLookupDomainBy(vshControl *ctl, + const char *name, + unsigned int flags) +{ + return virshLookupDomainInternal(ctl, "unknown", name, flags); +} + + +virDomainPtr +virshCommandOptDomainBy(vshControl *ctl, + const vshCmd *cmd, + const char **name, + unsigned int flags) +{ + const char *n = NULL; + const char *optname = "domain"; + + if (vshCommandOptStringReq(ctl, cmd, optname, &n) < 0) + return NULL; + + vshDebug(ctl, VSH_ERR_INFO, "%s: found option <%s>: %s\n", + cmd->def->name, optname, n); + + if (name) + *name = n; + + return virshLookupDomainInternal(ctl, cmd->def->name, n, flags); +} + + +virDomainPtr +virshCommandOptDomain(vshControl *ctl, + const vshCmd *cmd, + const char **name) +{ + return virshCommandOptDomainBy(ctl, cmd, name, + VIRSH_BYID | VIRSH_BYUUID | VIRSH_BYNAME); +} + int virshDomainState(vshControl *ctl, diff --git a/tools/virsh-util.h b/tools/virsh-util.h index 207d57859..132bf0b4b 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -21,6 +21,23 @@ # include "virsh.h" + +virDomainPtr +virshLookupDomainBy(vshControl *ctl, + const char *name, + unsigned int flags); + +virDomainPtr +virshCommandOptDomainBy(vshControl *ctl, + const vshCmd *cmd, + const char **name, + unsigned int flags); + +virDomainPtr +virshCommandOptDomain(vshControl *ctl, + const vshCmd *cmd, + const char **name); + int virshDomainState(vshControl *ctl, virDomainPtr dom, -- 2.12.2

virDomainFree has it's quirks (does not like NULL pointers, resets libvirt errors). Replace it by a virsh helper which will allow us to centrally fix issues with it. The syntax-check rule will prohibit new uses of virDomainFree. --- cfg.mk | 8 ++ tools/virsh-domain-monitor.c | 36 ++++---- tools/virsh-domain.c | 216 ++++++++++++++++++++----------------------- tools/virsh-snapshot.c | 24 ++--- tools/virsh-util.c | 10 ++ tools/virsh-util.h | 3 + 6 files changed, 149 insertions(+), 148 deletions(-) diff --git a/cfg.mk b/cfg.mk index cc174a3cc..1ff87f445 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1014,6 +1014,14 @@ sc_gettext_init: halt='the above files do not call virGettextInitialize' \ $(_sc_search_regexp) +#Ensure that virsh uses the wrappers on top of the object freeing APIs +sc_prohibit_obj_free_apis_in_virsh: + @prohibit='\virDomainFree\b' \ + in_vc_files='\virsh.*\.[ch]$$' \ + exclude='sc_prohibit_obj_free_apis_in_virsh' \ + halt='avoid using virDomainFree in virsh, use virsh-prefixed wrappers instead' \ + $(_sc_search_regexp) + # We don't use this feature of maint.mk. prev_version_file = /dev/null diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 5215ac6f9..92995ad7d 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -381,7 +381,7 @@ cmdDomMemStat(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -432,7 +432,7 @@ cmdDomblkinfo(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -554,7 +554,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); VIR_FREE(xml); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -648,7 +648,7 @@ cmdDomiflist(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(interfaces); - virDomainFree(dom); + virshDomainFree(dom); VIR_FREE(xml); xmlFreeDoc(xmldoc); xmlXPathFreeContext(ctxt); @@ -758,7 +758,7 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xpath); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -811,7 +811,7 @@ cmdDomControl(vshControl *ctl, const vshCmd *cmd) } cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -997,7 +997,7 @@ cmdDomblkstat(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(params); - virDomainFree(dom); + virshDomainFree(dom); return ret; } #undef DOMBLKSTAT_LEGACY_PRINT @@ -1071,7 +1071,7 @@ cmdDomIfstat(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1132,7 +1132,7 @@ cmdDomBlkError(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(disks); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1241,7 +1241,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) memset(&secmodel, 0, sizeof(secmodel)); if (virNodeGetSecurityModel(priv->conn, &secmodel) == -1) { if (last_error->code != VIR_ERR_NO_SUPPORT) { - virDomainFree(dom); + virshDomainFree(dom); return false; } else { vshResetLibvirtError(); @@ -1254,12 +1254,12 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) /* Security labels are only valid for active domains */ if (VIR_ALLOC(seclabel) < 0) { - virDomainFree(dom); + virshDomainFree(dom); return false; } if (virDomainGetSecurityLabel(dom, seclabel) == -1) { - virDomainFree(dom); + virshDomainFree(dom); VIR_FREE(seclabel); return false; } else { @@ -1271,7 +1271,7 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) VIR_FREE(seclabel); } } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1323,7 +1323,7 @@ cmdDomstate(vshControl *ctl, const vshCmd *cmd) } cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1427,7 +1427,7 @@ cmdDomTime(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1493,7 +1493,7 @@ virshDomainListFree(virshDomainListPtr domlist) if (domlist && domlist->domains) { for (i = 0; i < domlist->ndomains; i++) { if (domlist->domains[i]) - virDomainFree(domlist->domains[i]); + virshDomainFree(domlist->domains[i]); } VIR_FREE(domlist->domains); } @@ -1689,7 +1689,7 @@ virshDomainListCollect(vshControl *ctl, unsigned int flags) remove_entry: /* the domain has to be removed as it failed one of the filters */ - virDomainFree(list->domains[i]); + virshDomainFree(list->domains[i]); list->domains[i] = NULL; deleted++; } @@ -2294,7 +2294,7 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(ifaces); - virDomainFree(dom); + virshDomainFree(dom); return ret; } diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 4e4df5b4f..ba179c89c 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -218,7 +218,7 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -700,8 +700,7 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(xml); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); virBufferFreeAndReset(&buf); return functionReturn; } @@ -1011,8 +1010,7 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(xml); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); virBufferFreeAndReset(&buf); return functionReturn; } @@ -1056,7 +1054,7 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) vshError(ctl, _("Failed to mark domain %s as autostarted"), name); else vshError(ctl, _("Failed to unmark domain %s as autostarted"), name); - virDomainFree(dom); + virshDomainFree(dom); return false; } @@ -1065,7 +1063,7 @@ cmdAutostart(vshControl *ctl, const vshCmd *cmd) else vshPrintExtra(ctl, _("Domain %s unmarked as autostarted\n"), name); - virDomainFree(dom); + virshDomainFree(dom); return true; } @@ -1379,8 +1377,7 @@ cmdBlkdeviotune(vshControl *ctl, const vshCmd *cmd) cleanup: virTypedParamsFree(params, nparams); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; save_error: @@ -1577,7 +1574,7 @@ cmdBlkiotune(vshControl * ctl, const vshCmd * cmd) cleanup: virTypedParamsFree(params, nparams); - virDomainFree(dom); + virshDomainFree(dom); return ret; save_error: @@ -2086,7 +2083,7 @@ cmdBlockCommit(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); virshBlockJobWaitFree(bjWait); return ret; } @@ -2394,7 +2391,7 @@ cmdBlockCopy(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(xmlstr); virTypedParamsFree(params, nparams); - virDomainFree(dom); + virshDomainFree(dom); virshBlockJobWaitFree(bjWait); return ret; } @@ -2638,8 +2635,7 @@ cmdBlockJob(vshControl *ctl, const vshCmd *cmd) ret = virshBlockJobInfo(ctl, dom, path, raw, bytes); cleanup: - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -2784,7 +2780,7 @@ cmdBlockPull(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); virshBlockJobWaitFree(bjWait); return ret; } @@ -2848,7 +2844,7 @@ cmdBlockResize(vshControl *ctl, const vshCmd *cmd) ret = true; } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -2942,7 +2938,7 @@ cmdConsole(vshControl *ctl, const vshCmd *cmd) ret = cmdRunConsole(ctl, dom, name, flags); cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } #endif /* WIN32 */ @@ -3123,7 +3119,7 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); VIR_FREE(xml_buf); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -3314,7 +3310,7 @@ cmdDomIftune(vshControl *ctl, const vshCmd *cmd) cleanup: virTypedParamsFree(params, nparams); - virDomainFree(dom); + virshDomainFree(dom); return ret; save_error: @@ -3359,7 +3355,7 @@ cmdSuspend(vshControl *ctl, const vshCmd *cmd) ret = false; } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -3438,7 +3434,7 @@ cmdDomPMSuspend(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -3485,7 +3481,7 @@ cmdDomPMWakeup(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -3905,7 +3901,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) VIR_FREE(vol_nodes); xmlFreeDoc(doc); xmlXPathFreeContext(ctxt); - virDomainFree(dom); + virshDomainFree(dom); return ret; error: @@ -4085,7 +4081,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); VIR_FREE(fds); return ret; } @@ -4183,8 +4179,7 @@ doSave(void *opaque) out: pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: - if (dom) - virDomainFree(dom); + virshDomainFree(dom); VIR_FREE(xml); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); } @@ -4344,7 +4339,7 @@ cmdSave(vshControl *ctl, const vshCmd *cmd) vshPrintExtra(ctl, _("\nDomain %s saved to %s\n"), name, to); cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -4607,8 +4602,7 @@ doManagedsave(void *opaque) out: pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: - if (dom) - virDomainFree(dom); + virshDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); } @@ -4651,7 +4645,7 @@ cmdManagedSave(vshControl *ctl, const vshCmd *cmd) vshPrintExtra(ctl, _("\nDomain %s state saved by libvirt\n"), name); cleanup: - virDomainFree(dom); + virshDomainFree(dom); VIR_FORCE_CLOSE(p[0]); VIR_FORCE_CLOSE(p[1]); return ret; @@ -4708,7 +4702,7 @@ cmdManagedSaveRemove(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -4943,7 +4937,7 @@ cmdSchedinfo(vshControl *ctl, const vshCmd *cmd) cleanup: virTypedParamsFree(params, nparams); virTypedParamsFree(updates, nupdates); - virDomainFree(dom); + virshDomainFree(dom); return ret_val; } @@ -5145,7 +5139,7 @@ doDump(void *opaque) pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: if (dom) - virDomainFree(dom); + virshDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); } @@ -5191,7 +5185,7 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) vshPrintExtra(ctl, _("\nDomain %s dumped to %s\n"), name, to); cleanup: - virDomainFree(dom); + virshDomainFree(dom); VIR_FORCE_CLOSE(p[0]); VIR_FORCE_CLOSE(p[1]); return ret; @@ -5330,7 +5324,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) unlink(file); if (generated) VIR_FREE(file); - virDomainFree(dom); + virshDomainFree(dom); if (st) virStreamFree(st); VIR_FORCE_CLOSE(fd); @@ -5399,7 +5393,7 @@ cmdSetUserPassword(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } /* @@ -5437,7 +5431,7 @@ cmdResume(vshControl *ctl, const vshCmd *cmd) ret = false; } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -5520,8 +5514,7 @@ cmdShutdown(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - if (dom) - virDomainFree(dom); + virshDomainFree(dom); virStringListFree(modes); return ret; } @@ -5600,8 +5593,7 @@ cmdReboot(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - if (dom) - virDomainFree(dom); + virshDomainFree(dom); virStringListFree(modes); return ret; } @@ -5641,7 +5633,7 @@ cmdReset(vshControl *ctl, const vshCmd *cmd) ret = false; } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -5943,7 +5935,7 @@ cmdDomjobinfo(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); virTypedParamsFree(params, nparams); return ret; @@ -5982,7 +5974,7 @@ cmdDomjobabort(vshControl *ctl, const vshCmd *cmd) if (virDomainAbortJob(dom) < 0) ret = false; - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -6183,7 +6175,7 @@ cmdVcpucount(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -6437,7 +6429,7 @@ cmdVcpuinfo(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(cpumaps); VIR_FREE(cpuinfo); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -6653,7 +6645,7 @@ cmdVcpuPin(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(cpumap); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -6714,13 +6706,13 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) return false; if (vshCommandOptStringReq(ctl, cmd, "cpulist", &cpulist) < 0) { - virDomainFree(dom); + virshDomainFree(dom); return false; } query = !cpulist; if ((maxcpu = virshNodeGetCPUCount(priv->conn)) < 0) { - virDomainFree(dom); + virshDomainFree(dom); return false; } @@ -6757,7 +6749,7 @@ cmdEmulatorPin(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: VIR_FREE(cpumap); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -6853,7 +6845,7 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -6939,7 +6931,7 @@ cmdGuestvcpus(vshControl *ctl, const vshCmd *cmd) cleanup: virTypedParamsFree(params, nparams); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -7021,7 +7013,7 @@ cmdSetvcpu(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -7079,7 +7071,7 @@ cmdDomblkthreshold(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -7155,7 +7147,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) VIR_FREE(info); cleanup: - virDomainFree(dom); + virshDomainFree(dom); return niothreads >= 0; } @@ -7237,7 +7229,7 @@ cmdIOThreadPin(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(cpumap); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -7302,7 +7294,7 @@ cmdIOThreadAdd(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -7367,7 +7359,7 @@ cmdIOThreadDel(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -7758,7 +7750,7 @@ cmdCPUStats(vshControl *ctl, const vshCmd *cmd) cleanup: virTypedParamsFree(params, nparams); - virDomainFree(dom); + virshDomainFree(dom); return ret; failed_stats: @@ -7854,7 +7846,7 @@ cmdCreate(vshControl *ctl, const vshCmd *cmd) if (console) cmdRunConsole(ctl, dom, NULL, 0); #endif - virDomainFree(dom); + virshDomainFree(dom); ret = true; cleanup: @@ -7913,7 +7905,7 @@ cmdDefine(vshControl *ctl, const vshCmd *cmd) if (dom != NULL) { vshPrintExtra(ctl, _("Domain %s defined from %s\n"), virDomainGetName(dom), from); - virDomainFree(dom); + virshDomainFree(dom); } else { vshError(ctl, _("Failed to define domain from %s"), from); ret = false; @@ -7970,7 +7962,7 @@ cmdDestroy(vshControl *ctl, const vshCmd *cmd) ret = false; } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -8137,8 +8129,7 @@ cmdDesc(vshControl *ctl, const vshCmd *cmd) unlink(tmp); VIR_FREE(tmp); } - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -8281,7 +8272,7 @@ cmdMetadata(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -8316,7 +8307,7 @@ cmdInjectNMI(vshControl *ctl, const vshCmd *cmd) if (virDomainInjectNMI(dom, 0) < 0) ret = false; - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -8412,7 +8403,7 @@ cmdSendKey(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -8517,7 +8508,7 @@ cmdSendProcessSignal(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -8585,7 +8576,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) else max = ULONG_MAX; if (vshCommandOptScaledInt(ctl, cmd, "size", &bytes, 1024, max) < 0) { - virDomainFree(dom); + virshDomainFree(dom); return false; } kibibytes = VIR_DIV_UP(bytes, 1024); @@ -8598,7 +8589,7 @@ cmdSetmem(vshControl *ctl, const vshCmd *cmd) ret = false; } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -8666,7 +8657,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) else max = ULONG_MAX; if (vshCommandOptScaledInt(ctl, cmd, "size", &bytes, 1024, max) < 0) { - virDomainFree(dom); + virshDomainFree(dom); return false; } kibibytes = VIR_DIV_UP(bytes, 1024); @@ -8683,7 +8674,7 @@ cmdSetmaxmem(vshControl *ctl, const vshCmd *cmd) } } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -8854,7 +8845,7 @@ cmdMemtune(vshControl *ctl, const vshCmd *cmd) cleanup: virTypedParamsFree(params, nparams); - virDomainFree(dom); + virshDomainFree(dom); return ret; save_error: @@ -8993,7 +8984,7 @@ cmdPerf(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: virTypedParamsFree(params, nparams); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -9126,7 +9117,7 @@ cmdNumatune(vshControl * ctl, const vshCmd * cmd) cleanup: virTypedParamsFree(params, nparams); - virDomainFree(dom); + virshDomainFree(dom); return ret; save_error: @@ -9220,7 +9211,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) VIR_FREE(result); VIR_FREE(monitor_cmd); virJSONValueFree(pretty); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -9384,8 +9375,7 @@ cmdQemuMonitorEvent(vshControl *ctl, const vshCmd *cmd) if (eventId >= 0 && virConnectDomainQemuMonitorEventDeregister(priv->conn, eventId) < 0) ret = false; - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -9431,7 +9421,7 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd) vshPrintExtra(ctl, _("Domain %s attached to pid %u\n"), virDomainGetName(dom), pid_value); - virDomainFree(dom); + virshDomainFree(dom); ret = true; cleanup: @@ -9555,8 +9545,7 @@ cmdQemuAgentCommand(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(result); VIR_FREE(guest_agent_cmd); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -9697,8 +9686,7 @@ cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(seclabel); VIR_FREE(secmodel); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); VIR_FREE(cmdargv); return ret; } @@ -9769,7 +9757,7 @@ cmdDumpXML(vshControl *ctl, const vshCmd *cmd) ret = false; } - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -9915,7 +9903,7 @@ cmdDomname(vshControl *ctl, const vshCmd *cmd) return false; vshPrint(ctl, "%s\n", virDomainGetName(dom)); - virDomainFree(dom); + virshDomainFree(dom); return true; } @@ -9962,7 +9950,7 @@ cmdDomrename(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -9999,7 +9987,7 @@ cmdDomid(vshControl *ctl, const vshCmd *cmd) vshPrint(ctl, "%s\n", "-"); else vshPrint(ctl, "%d\n", id); - virDomainFree(dom); + virshDomainFree(dom); return true; } @@ -10036,7 +10024,7 @@ cmdDomuuid(vshControl *ctl, const vshCmd *cmd) else vshError(ctl, "%s", _("failed to get domain UUID")); - virDomainFree(dom); + virshDomainFree(dom); return true; } @@ -10466,7 +10454,7 @@ doMigrate(void *opaque) virDomainPtr ddom = NULL; if ((ddom = virDomainMigrate3(dom, dconn, params, nparams, flags))) { - virDomainFree(ddom); + virshDomainFree(ddom); ret = '0'; } } @@ -10475,8 +10463,7 @@ doMigrate(void *opaque) pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL); out_sig: virTypedParamsFree(params, nparams); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); ignore_value(safewrite(data->writefd, &ret, sizeof(ret))); return; @@ -10632,7 +10619,7 @@ cmdMigrate(vshControl *ctl, const vshCmd *cmd) virConnectClose(data.dconn); if (iterEvent != -1) virConnectDomainEventDeregisterAny(priv->conn, iterEvent); - virDomainFree(dom); + virshDomainFree(dom); VIR_FORCE_CLOSE(p[0]); VIR_FORCE_CLOSE(p[1]); return functionReturn; @@ -10684,7 +10671,7 @@ cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd) ret = true; done: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -10741,7 +10728,7 @@ cmdMigrateCompCache(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -10788,7 +10775,7 @@ cmdMigrateSetMaxSpeed(vshControl *ctl, const vshCmd *cmd) ret = true; done: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -10828,7 +10815,7 @@ cmdMigrateGetMaxSpeed(vshControl *ctl, const vshCmd *cmd) ret = true; done: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -10870,7 +10857,7 @@ cmdMigratePostCopy(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -11127,7 +11114,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(output); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -11208,7 +11195,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) VIR_FREE(listen_addr); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -11264,7 +11251,7 @@ cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -11307,7 +11294,7 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) error: VIR_FREE(hostname); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -11504,7 +11491,7 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(buffer); - virDomainFree(dom); + virshDomainFree(dom); return funcRet; } @@ -11586,7 +11573,7 @@ cmdUpdateDevice(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(buffer); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -11772,7 +11759,7 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(doc_live); VIR_FREE(doc_config); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -12129,7 +12116,7 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) xmlFreeNode(disk_node); VIR_FREE(disk_xml); VIR_FREE(doc); - virDomainFree(dom); + virshDomainFree(dom); return functionReturn; } @@ -12196,10 +12183,8 @@ cmdEdit(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - if (dom) - virDomainFree(dom); - if (dom_edited) - virDomainFree(dom_edited); + virshDomainFree(dom); + virshDomainFree(dom_edited); return ret; } @@ -13087,8 +13072,7 @@ cmdEvent(vshControl *ctl, const vshCmd *cmd) } VIR_FREE(data); } - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -13253,7 +13237,7 @@ cmdChangeMedia(vshControl *ctl, const vshCmd *cmd) VIR_FREE(doc); xmlFreeNode(disk_node); VIR_FREE(disk_xml); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -13306,7 +13290,7 @@ cmdDomFSTrim(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -13359,7 +13343,7 @@ cmdDomFSFreeze(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(mountpoints); - virDomainFree(dom); + virshDomainFree(dom); return ret >= 0; } @@ -13412,7 +13396,7 @@ cmdDomFSThaw(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(mountpoints); - virDomainFree(dom); + virshDomainFree(dom); return ret >= 0; } @@ -13472,7 +13456,7 @@ cmdDomFSInfo(vshControl *ctl, const vshCmd *cmd) } cleanup: - virDomainFree(dom); + virshDomainFree(dom); return ret >= 0; } diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 46e2cbb24..5af9a7d7a 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -210,8 +210,7 @@ cmdSnapshotCreate(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(buffer); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -454,7 +453,7 @@ cmdSnapshotCreateAs(vshControl *ctl, const vshCmd *cmd) cleanup: virBufferFreeAndReset(&buf); VIR_FREE(buffer); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -606,7 +605,7 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) virDomainSnapshotFree(edited); if (snapshot) virDomainSnapshotFree(snapshot); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -720,7 +719,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xml); if (snapshot) virDomainSnapshotFree(snapshot); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1008,7 +1007,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) VIR_FREE(parent); if (snapshot) virDomainSnapshotFree(snapshot); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1647,7 +1646,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); VIR_FREE(doc); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1711,7 +1710,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) VIR_FREE(xml); if (snapshot) virDomainSnapshotFree(snapshot); - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1771,8 +1770,7 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) VIR_FREE(parent); if (snapshot) virDomainSnapshotFree(snapshot); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1857,8 +1855,7 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) cleanup: if (snapshot) virDomainSnapshotFree(snapshot); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } @@ -1940,8 +1937,7 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) cleanup: if (snapshot) virDomainSnapshotFree(snapshot); - if (dom) - virDomainFree(dom); + virshDomainFree(dom); return ret; } diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 5c99655fb..5fdb40855 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -150,3 +150,13 @@ virshStreamSink(virStreamPtr st ATTRIBUTE_UNUSED, return safewrite(*fd, bytes, nbytes); } + + +void +virshDomainFree(virDomainPtr dom) +{ + if (!dom) + return; + + virDomainFree(dom); /* sc_prohibit_obj_free_apis_in_virsh */ +} diff --git a/tools/virsh-util.h b/tools/virsh-util.h index 132bf0b4b..78f7a0ea9 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -38,6 +38,9 @@ virshCommandOptDomain(vshControl *ctl, const vshCmd *cmd, const char **name); +void +virshDomainFree(virDomainPtr dom); + int virshDomainState(vshControl *ctl, virDomainPtr dom, -- 2.12.2

Similarly to virshDomainFree add a wrapper for the snapshot object freeing function. --- tools/virsh-snapshot.c | 48 ++++++++++++++++++------------------------------ tools/virsh-util.c | 10 ++++++++++ tools/virsh-util.h | 3 +++ 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index 5af9a7d7a..24cd4abd9 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -106,8 +106,7 @@ virshSnapshotCreate(vshControl *ctl, virDomainPtr dom, const char *buffer, cleanup: xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); VIR_FREE(doc); return ret; } @@ -601,10 +600,8 @@ cmdSnapshotEdit(vshControl *ctl, const vshCmd *cmd) cleanup: if (!ret && name) vshError(ctl, _("Failed to update %s"), name); - if (edited) - virDomainSnapshotFree(edited); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(edited); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; } @@ -681,7 +678,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) if (!(snapshot2 = virDomainSnapshotCreateXML(dom, xml, flags))) goto cleanup; - virDomainSnapshotFree(snapshot2); + virshDomainSnapshotFree(snapshot2); vshPrintExtra(ctl, _("Snapshot %s set as current"), snapshotname); ret = true; goto cleanup; @@ -717,8 +714,7 @@ cmdSnapshotCurrent(vshControl *ctl, const vshCmd *cmd) if (!ret) vshReportError(ctl); VIR_FREE(xml); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; @@ -777,8 +773,7 @@ virshGetSnapshotParent(vshControl *ctl, virDomainSnapshotPtr snapshot, } else { vshResetLibvirtError(); } - if (parent) - virDomainSnapshotFree(parent); + virshDomainSnapshotFree(parent); xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); VIR_FREE(xml); @@ -906,7 +901,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) if (other) { if (STREQ(name, virDomainSnapshotGetName(other))) current = 1; - virDomainSnapshotFree(other); + virshDomainSnapshotFree(other); } } vshPrint(ctl, "%-15s %s\n", _("Current:"), @@ -1005,8 +1000,7 @@ cmdSnapshotInfo(vshControl *ctl, const vshCmd *cmd) xmlFreeDoc(xmldoc); VIR_FREE(doc); VIR_FREE(parent); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; } @@ -1031,8 +1025,7 @@ virshSnapshotListFree(virshSnapshotListPtr snaplist) return; if (snaplist->snaps) { for (i = 0; i < snaplist->nsnaps; i++) { - if (snaplist->snaps[i].snap) - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); VIR_FREE(snaplist->snaps[i].parent); } VIR_FREE(snaplist->snaps); @@ -1270,7 +1263,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, STRNEQ_NULLABLE(fromname, snaplist->snaps[i].parent)))) || (roots && snaplist->snaps[i].parent)) { - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap = NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; @@ -1298,7 +1291,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, for (i = 0; i < count; i++) { if (i == start_index || !snaplist->snaps[i].parent) { VIR_FREE(names[i]); - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap = NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; @@ -1336,7 +1329,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, if (!found_parent) { changed = true; VIR_FREE(names[i]); - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap = NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; @@ -1359,7 +1352,7 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, case 1: break; case 0: - virDomainSnapshotFree(snaplist->snaps[i].snap); + virshDomainSnapshotFree(snaplist->snaps[i].snap); snaplist->snaps[i].snap = NULL; VIR_FREE(snaplist->snaps[i].parent); deleted++; @@ -1641,8 +1634,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd) virshSnapshotListFree(snaplist); VIR_FREE(parent_snap); VIR_FREE(state); - if (start) - virDomainSnapshotFree(start); + virshDomainSnapshotFree(start); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); VIR_FREE(doc); @@ -1708,8 +1700,7 @@ cmdSnapshotDumpXML(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(xml); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; @@ -1768,8 +1759,7 @@ cmdSnapshotParent(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(parent); - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; @@ -1853,8 +1843,7 @@ cmdDomainSnapshotRevert(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; @@ -1935,8 +1924,7 @@ cmdSnapshotDelete(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - if (snapshot) - virDomainSnapshotFree(snapshot); + virshDomainSnapshotFree(snapshot); virshDomainFree(dom); return ret; diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 5fdb40855..e225d3332 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -160,3 +160,13 @@ virshDomainFree(virDomainPtr dom) virDomainFree(dom); /* sc_prohibit_obj_free_apis_in_virsh */ } + + +void +virshDomainSnapshotFree(virDomainSnapshotPtr snap) +{ + if (!snap) + return; + + virDomainSnapshotFree(snap); /* sc_prohibit_obj_free_apis_in_virsh */ +} diff --git a/tools/virsh-util.h b/tools/virsh-util.h index 78f7a0ea9..2b5aedfba 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -41,6 +41,9 @@ virshCommandOptDomain(vshControl *ctl, void virshDomainFree(virDomainPtr dom); +void +virshDomainSnapshotFree(virDomainSnapshotPtr snap); + int virshDomainState(vshControl *ctl, virDomainPtr dom, -- 2.12.2

Avoid the annoying issue where the public object freeing APIs overwrite the error set by helper functions, since they don't invoke the callback. The new helper remembers the error only if no previous error was set. --- tools/virsh-util.c | 2 ++ tools/vsh.c | 15 +++++++++++++++ tools/vsh.h | 1 + 3 files changed, 18 insertions(+) diff --git a/tools/virsh-util.c b/tools/virsh-util.c index e225d3332..79a38bb23 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -158,6 +158,7 @@ virshDomainFree(virDomainPtr dom) if (!dom) return; + vshSaveLibvirtHelperError(); virDomainFree(dom); /* sc_prohibit_obj_free_apis_in_virsh */ } @@ -168,5 +169,6 @@ virshDomainSnapshotFree(virDomainSnapshotPtr snap) if (!snap) return; + vshSaveLibvirtHelperError(); virDomainSnapshotFree(snap); /* sc_prohibit_obj_free_apis_in_virsh */ } diff --git a/tools/vsh.c b/tools/vsh.c index d2024be91..10a65c39f 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -258,6 +258,21 @@ vshSaveLibvirtError(void) last_error = virSaveLastError(); } + +/* Store libvirt error from helper API but don't overwrite existing errors */ +void +vshSaveLibvirtHelperError(void) +{ + if (last_error) + return; + + if (!virGetLastError()) + return; + + vshSaveLibvirtError(); +} + + /* * Reset libvirt error on graceful fallback paths */ diff --git a/tools/vsh.h b/tools/vsh.h index 8f5d1a69f..2f686eba6 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -341,6 +341,7 @@ void vshErrorHandler(void *opaque, virErrorPtr error); void vshReportError(vshControl *ctl); void vshResetLibvirtError(void); void vshSaveLibvirtError(void); +void vshSaveLibvirtHelperError(void); /* file handling */ char *vshEditWriteToTempFile(vshControl *ctl, const char *doc); -- 2.12.2

In virsh we quite often get the domain XML just to initialize the XPath parser so that we can extract information. Add helpers which will simplify this by wrapping the getting of the XML and parsing it along with error reporting. Additionally a second helper also gets the domain object from the parameters and releases it so that functions which need the XML as only source of data can be simplified further. --- tools/virsh-util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh-util.h | 20 ++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 79a38bb23..4b86e29cb 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -22,6 +22,7 @@ #include "virfile.h" #include "virstring.h" +#include "viralloc.h" static virDomainPtr virshLookupDomainInternal(vshControl *ctl, @@ -172,3 +173,50 @@ virshDomainSnapshotFree(virDomainSnapshotPtr snap) vshSaveLibvirtHelperError(); virDomainSnapshotFree(snap); /* sc_prohibit_obj_free_apis_in_virsh */ } + + +int +virshDomainGetXMLFromDom(vshControl *ctl, + virDomainPtr dom, + unsigned int flags, + xmlDocPtr *xml, + xmlXPathContextPtr *ctxt) +{ + char *desc = NULL; + + if (!(desc = virDomainGetXMLDesc(dom, flags))) { + vshError(ctl, _("Failed to get domain description xml")); + return -1; + } + + *xml = virXMLParseStringCtxt(desc, _("(domain_definition)"), ctxt); + VIR_FREE(desc); + + if (!(*xml)) { + vshError(ctl, _("Failed to parse domain description xml")); + return -1; + } + + return 0; +} + + +int +virshDomainGetXML(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags, + xmlDocPtr *xml, + xmlXPathContextPtr *ctxt) +{ + virDomainPtr dom; + int ret; + + if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + return -1; + + ret = virshDomainGetXMLFromDom(ctl, dom, flags, xml, ctxt); + + virshDomainFree(dom); + + return ret; +} diff --git a/tools/virsh-util.h b/tools/virsh-util.h index 2b5aedfba..64cef23c0 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -21,6 +21,8 @@ # include "virsh.h" +# include <libxml/parser.h> +# include <libxml/xpath.h> virDomainPtr virshLookupDomainBy(vshControl *ctl, @@ -55,4 +57,22 @@ virshStreamSink(virStreamPtr st, size_t nbytes, void *opaque); +int +virshDomainGetXMLFromDom(vshControl *ctl, + virDomainPtr dom, + unsigned int flags, + xmlDocPtr *xml, + xmlXPathContextPtr *ctxt) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) + ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + +int +virshDomainGetXML(vshControl *ctl, + const vshCmd *cmd, + unsigned int flags, + xmlDocPtr *xml, + xmlXPathContextPtr *ctxt) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) + ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + #endif /* VIRSH_UTIL_H */ -- 2.12.2

Reuse virshDomainGetXML and virshDomainGetXMLFromDom. --- tools/virsh-domain-monitor.c | 57 ++++---------------------------------------- 1 file changed, 5 insertions(+), 52 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index 92995ad7d..3db4795d2 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -63,7 +63,6 @@ virshGetDomainDescription(vshControl *ctl, virDomainPtr dom, bool title, unsigned int flags) { char *desc = NULL; - char *domxml = NULL; virErrorPtr err = NULL; xmlDocPtr doc = NULL; xmlXPathContextPtr ctxt = NULL; @@ -90,16 +89,9 @@ virshGetDomainDescription(vshControl *ctl, virDomainPtr dom, bool title, } /* fall back to xml */ - /* get domain's xml description and extract the title/description */ - if (!(domxml = virDomainGetXMLDesc(dom, flags))) { - vshError(ctl, "%s", _("Failed to retrieve domain XML")); + if (virshDomainGetXMLFromDom(ctl, dom, flags, &doc, &ctxt) < 0) goto cleanup; - } - doc = virXMLParseStringCtxt(domxml, _("(domain_definition)"), &ctxt); - if (!doc) { - vshError(ctl, "%s", _("Couldn't parse domain XML")); - goto cleanup; - } + if (title) desc = virXPathString("string(./title[1])", ctxt); else @@ -109,7 +101,6 @@ virshGetDomainDescription(vshControl *ctl, virDomainPtr dom, bool title, desc = vshStrdup(ctl, ""); cleanup: - VIR_FREE(domxml); xmlXPathFreeContext(ctxt); xmlFreeDoc(doc); @@ -465,10 +456,8 @@ static const vshCmdOptDef opts_domblklist[] = { static bool cmdDomblklist(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; bool ret = false; unsigned int flags = 0; - char *xml = NULL; xmlDocPtr xmldoc = NULL; xmlXPathContextPtr ctxt = NULL; int ndisks; @@ -485,15 +474,7 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) details = vshCommandOptBool(cmd, "details"); - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; - - xml = virDomainGetXMLDesc(dom, flags); - if (!xml) - goto cleanup; - - xmldoc = virXMLParseStringCtxt(xml, _("(domain_definition)"), &ctxt); - if (!xmldoc) + if (virshDomainGetXML(ctl, cmd, flags, &xmldoc, &ctxt) < 0) goto cleanup; ndisks = virXPathNodeSet("./devices/disk", ctxt, &disks); @@ -553,8 +534,6 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd) VIR_FREE(disks); xmlXPathFreeContext(ctxt); xmlFreeDoc(xmldoc); - VIR_FREE(xml); - virshDomainFree(dom); return ret; } @@ -579,10 +558,8 @@ static const vshCmdOptDef opts_domiflist[] = { static bool cmdDomiflist(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; bool ret = false; unsigned int flags = 0; - char *xml = NULL; xmlDocPtr xmldoc = NULL; xmlXPathContextPtr ctxt = NULL; int ninterfaces; @@ -592,15 +569,7 @@ cmdDomiflist(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "inactive")) flags |= VIR_DOMAIN_XML_INACTIVE; - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; - - xml = virDomainGetXMLDesc(dom, flags); - if (!xml) - goto cleanup; - - xmldoc = virXMLParseStringCtxt(xml, _("(domain_definition)"), &ctxt); - if (!xmldoc) + if (virshDomainGetXML(ctl, cmd, flags, &xmldoc, &ctxt) < 0) goto cleanup; ninterfaces = virXPathNodeSet("./devices/interface", ctxt, &interfaces); @@ -648,8 +617,6 @@ cmdDomiflist(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(interfaces); - virshDomainFree(dom); - VIR_FREE(xml); xmlFreeDoc(xmldoc); xmlXPathFreeContext(ctxt); return ret; @@ -686,13 +653,11 @@ static const vshCmdOptDef opts_domif_getlink[] = { static bool cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) { - virDomainPtr dom; const char *iface = NULL; char *state = NULL; char *xpath = NULL; virMacAddr macaddr; char macstr[VIR_MAC_STRING_BUFLEN] = ""; - char *desc = NULL; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr *interfaces = NULL; @@ -703,21 +668,11 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "interface", &iface) < 0) return false; - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) - return false; - if (vshCommandOptBool(cmd, "config")) flags = VIR_DOMAIN_XML_INACTIVE; - if (!(desc = virDomainGetXMLDesc(dom, flags))) { - vshError(ctl, _("Failed to get domain description xml")); + if (virshDomainGetXML(ctl, cmd, flags, &xml, &ctxt) < 0) goto cleanup; - } - - if (!(xml = virXMLParseStringCtxt(desc, _("(domain_definition)"), &ctxt))) { - vshError(ctl, _("Failed to parse domain description xml")); - goto cleanup; - } /* normalize the mac addr */ if (virMacAddrParse(iface, &macaddr) == 0) @@ -752,13 +707,11 @@ cmdDomIfGetLink(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - VIR_FREE(desc); VIR_FREE(state); VIR_FREE(interfaces); VIR_FREE(xpath); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - virshDomainFree(dom); return ret; } -- 2.12.2

Reuse virshDomainGetXML and virshDomainGetXMLFromDom. --- tools/virsh-domain.c | 62 ++++++++++------------------------------------------ 1 file changed, 12 insertions(+), 50 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index ba179c89c..d64a2dca0 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -2983,13 +2983,13 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) const char *iface; const char *state; char *value; - char *desc; virMacAddr macaddr; const char *element; const char *attr; bool config; bool ret = false; unsigned int flags = 0; + unsigned int xmlflags = 0; size_t i; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; @@ -3011,28 +3011,18 @@ cmdDomIfSetLink(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - /* get persistent or live description of network device */ - desc = virDomainGetXMLDesc(dom, config ? VIR_DOMAIN_XML_INACTIVE : 0); - if (desc == NULL) { - vshError(ctl, _("Failed to get domain description xml")); - goto cleanup; - } - - if (config) + if (config) { flags = VIR_DOMAIN_AFFECT_CONFIG; - else + xmlflags |= VIR_DOMAIN_XML_INACTIVE; + } else { flags = VIR_DOMAIN_AFFECT_LIVE; + } if (virDomainIsActive(dom) == 0) flags = VIR_DOMAIN_AFFECT_CONFIG; - /* extract current network device description */ - xml = virXMLParseStringCtxt(desc, _("(domain_definition)"), &ctxt); - VIR_FREE(desc); - if (!xml) { - vshError(ctl, _("Failed to parse domain description xml")); + if (virshDomainGetXMLFromDom(ctl, dom, xmlflags, &xml, &ctxt) < 0) goto cleanup; - } obj = xmlXPathEval(BAD_CAST "/domain/devices/interface", ctxt); if (obj == NULL || obj->type != XPATH_NODESET || @@ -3575,7 +3565,6 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) int nvol_list = 0; virshUndefineVolume *vols = NULL; /* info about the volumes to delete*/ size_t nvols = 0; - char *def = NULL; /* domain def */ xmlDocPtr doc = NULL; xmlXPathContextPtr ctxt = NULL; xmlNodePtr *vol_nodes = NULL; /* XML nodes of volumes of the guest */ @@ -3685,14 +3674,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (!(def = virDomainGetXMLDesc(dom, 0))) { - vshError(ctl, _("Could not retrieve domain XML description")); + if (virshDomainGetXMLFromDom(ctl, dom, 0, &doc, &ctxt) < 0) goto cleanup; - } - - if (!(doc = virXMLParseStringCtxt(def, _("(domain_definition)"), - &ctxt))) - goto error; /* tokenize the string from user and save its parts into an array */ if (vol_string && @@ -3897,7 +3880,6 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) VIR_FREE(vol_list[i]); VIR_FREE(vol_list); - VIR_FREE(def); VIR_FREE(vol_nodes); xmlFreeDoc(doc); xmlXPathFreeContext(ctxt); @@ -6029,7 +6011,6 @@ virshCPUCountCollect(vshControl *ctl, int ret = -2; virDomainInfo info; int count; - char *def = NULL; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; @@ -6071,10 +6052,8 @@ virshCPUCountCollect(vshControl *ctl, count = info.nrVirtCpu; } } else { - if (!(def = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_INACTIVE))) - goto cleanup; - - if (!(xml = virXMLParseStringCtxt(def, _("(domain_definition)"), &ctxt))) + if (virshDomainGetXMLFromDom(ctl, dom, VIR_DOMAIN_XML_INACTIVE, + &xml, &ctxt) < 0) goto cleanup; if (flags & VIR_DOMAIN_VCPU_MAXIMUM) { @@ -6092,7 +6071,6 @@ virshCPUCountCollect(vshControl *ctl, ret = count; cleanup: - VIR_FREE(def); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); @@ -6237,7 +6215,6 @@ virshDomainGetVcpuBitmap(vshControl *ctl, bool inactive) { unsigned int flags = 0; - char *def = NULL; virBitmapPtr ret = NULL; xmlDocPtr xml = NULL; xmlXPathContextPtr ctxt = NULL; @@ -6253,10 +6230,7 @@ virshDomainGetVcpuBitmap(vshControl *ctl, if (inactive) flags |= VIR_DOMAIN_XML_INACTIVE; - if (!(def = virDomainGetXMLDesc(dom, flags))) - goto cleanup; - - if (!(xml = virXMLParseStringCtxt(def, _("(domain_definition)"), &ctxt))) + if (virshDomainGetXMLFromDom(ctl, dom, flags, &xml, &ctxt) < 0) goto cleanup; if (virXPathUInt("string(/domain/vcpu)", ctxt, &maxvcpus) < 0) { @@ -6308,7 +6282,6 @@ virshDomainGetVcpuBitmap(vshControl *ctl, VIR_FREE(nodes); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - VIR_FREE(def); return ret; } @@ -10901,7 +10874,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; virBuffer buf = VIR_BUFFER_INITIALIZER; bool ret = false; - char *doc = NULL; char *xpath = NULL; char *listen_addr = NULL; int port, tls_port = 0; @@ -10931,10 +10903,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptStringReq(ctl, cmd, "type", &type) < 0) goto cleanup; - if (!(doc = virDomainGetXMLDesc(dom, flags))) - goto cleanup; - - if (!(xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt))) + if (virshDomainGetXMLFromDom(ctl, dom, flags, &xml, &ctxt) < 0) goto cleanup; /* Attempt to grab our display info */ @@ -11107,14 +11076,12 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) } cleanup: - VIR_FREE(doc); VIR_FREE(xpath); VIR_FREE(passwd); VIR_FREE(listen_addr); VIR_FREE(output); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - virshDomainFree(dom); return ret; } @@ -11144,7 +11111,6 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; bool ret = false; int port = 0; - char *doc = NULL; char *listen_addr = NULL; if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) @@ -11156,10 +11122,7 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - if (!(doc = virDomainGetXMLDesc(dom, 0))) - goto cleanup; - - if (!(xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt))) + if (virshDomainGetXMLFromDom(ctl, dom, 0, &xml, &ctxt) < 0) goto cleanup; /* Get the VNC port */ @@ -11191,7 +11154,6 @@ cmdVNCDisplay(vshControl *ctl, const vshCmd *cmd) ret = true; cleanup: - VIR_FREE(doc); VIR_FREE(listen_addr); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); -- 2.12.2

Use the new XML helpers and use virXPathString rather than hand-rolling the code. --- tools/virsh-domain.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index d64a2dca0..d6f33b1ee 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -11183,37 +11183,23 @@ static bool cmdTTYConsole(vshControl *ctl, const vshCmd *cmd) { xmlDocPtr xml = NULL; - xmlXPathObjectPtr obj = NULL; xmlXPathContextPtr ctxt = NULL; - virDomainPtr dom; bool ret = false; - char *doc; + char *tty = NULL; - if (!(dom = virshCommandOptDomain(ctl, cmd, NULL))) + if (virshDomainGetXML(ctl, cmd, 0, &xml, &ctxt) < 0) return false; - doc = virDomainGetXMLDesc(dom, 0); - if (!doc) + if (!(tty = virXPathString("string(/domain/devices/console/@tty)", ctxt))) goto cleanup; - xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); - VIR_FREE(doc); - if (!xml) - goto cleanup; - - obj = xmlXPathEval(BAD_CAST "string(/domain/devices/console/@tty)", ctxt); - if (obj == NULL || obj->type != XPATH_STRING || - obj->stringval == NULL || obj->stringval[0] == 0) { - goto cleanup; - } - vshPrint(ctl, "%s\n", (const char *)obj->stringval); + vshPrint(ctl, "%s\n", tty); ret = true; cleanup: - xmlXPathFreeObject(obj); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); - virshDomainFree(dom); + VIR_FREE(tty); return ret; } -- 2.12.2