Re: [libvirt] [PATCH v4 1/2] xen_common: Split per-Vif logic from xenParseVif()

On Thu, Jun 14, 2018 at 06:59:52AM +0200, Fabiano Fidêncio wrote: Reviewed-by: Ján Tomko <jtomko(a)redhat.com&gt; With the following diff squashed in, to minimize changes: Jano diff --git a/src/xenconfig/xen_common.c b/src/xenconfig/xen_common.c index 02765c540b..4a94127da1 100644 --- a/src/xenconfig/xen_common.c +++ b/src/xenconfig/xen_common.c @@ -984,25 +984,21 @@ xenParseVif(char *entry, const char *vif_typename) virStringListFree(ip_list); } - if (script && script[0]) { - if (VIR_STRDUP(net->script, script) < 0) - goto cleanup; - } + if (script && script[0] && + VIR_STRDUP(net->script, script) < 0) + goto cleanup; - if (model[0]) { - if (VIR_STRDUP(net->model, model) < 0) - goto cleanup; - } + if (model[0] && + VIR_STRDUP(net->model, model) < 0) + goto cleanup; - if (!model[0] && type[0] && STREQ(type, vif_typename)) { - if (VIR_STRDUP(net->model, "netfront") < 0) - goto cleanup; - } + if (!model[0] && type[0] && STREQ(type, vif_typename) && + VIR_STRDUP(net->model, "netfront") < 0) + goto cleanup; - if (vifname[0]) { - if (VIR_STRDUP(net->ifname, vifname) < 0) - goto cleanup; - } + if (vifname[0] && + VIR_STRDUP(net->ifname, vifname) < 0) + goto cleanup; if (rate[0]) { virNetDevBandwidthPtr bandwidth;