diff --git a/examples/dommigrate/dommigrate.c b/examples/dommigrate/dommigrate.c index 1b6072d138..60cfb3fb83 100644 --- a/examples/dommigrate/dommigrate.c +++ b/examples/dommigrate/dommigrate.c @@ -79,8 +79,7 @@ main(int argc, char *argv[]) cleanup: if (dom != NULL) virDomainFree(dom); - if (conn != NULL) - virConnectClose(conn); + virConnectClose(conn); out: return ret; diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 7cad3ccc57..15290f7f80 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2659,10 +2659,8 @@ virNWFilterDefParseXML(xmlXPathContextPtr ctxt) ret->chainPriority = chain_priority; } else { /* assign default priority if none can be found via lookup */ - if (!name_prefix || - intMapGetByString(chain_priorities, name_prefix, 0, - &ret->chainPriority) < 0) { - /* assign default chain priority */ + if (intMapGetByString(chain_priorities, name_prefix, + 0, &ret->chainPriority) < 0) { ret->chainPriority = (NWFILTER_MAX_FILTER_PRIORITY + NWFILTER_MIN_FILTER_PRIORITY) / 2; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 853b0932b0..3a2ec7f26c 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4340,8 +4340,7 @@ qemuBuildNVRAMCommandLine(virCommandPtr cmd, optstr = qemuBuildNVRAMDevStr(def->nvram); if (!optstr) return -1; - if (optstr) - virCommandAddArg(cmd, optstr); + virCommandAddArg(cmd, optstr); VIR_FREE(optstr); } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 00dbff6b2a..19b7e6e8ea 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -3521,17 +3521,15 @@ qemuDomainChangeNetBridge(virDomainObjPtr vm, goto cleanup; } - if (oldbridge) { - ret = virNetDevBridgeRemovePort(oldbridge, olddev->ifname); - virDomainAuditNet(vm, olddev, NULL, "detach", ret == 0); - if (ret < 0) { - /* warn but continue - possibly the old network - * had been destroyed and reconstructed, leaving the - * tap device orphaned. - */ - VIR_WARN("Unable to detach device %s from bridge %s", - olddev->ifname, oldbridge); - } + ret = virNetDevBridgeRemovePort(oldbridge, olddev->ifname); + virDomainAuditNet(vm, olddev, NULL, "detach", ret == 0); + if (ret < 0) { + /* warn but continue - possibly the old network + * had been destroyed and reconstructed, leaving the + * tap device orphaned. + */ + VIR_WARN("Unable to detach device %s from bridge %s", + olddev->ifname, oldbridge); } ret = virNetDevBridgeAddPort(newbridge, olddev->ifname); diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c index 97891b2f8f..0857d4e882 100644 --- a/src/util/virresctrl.c +++ b/src/util/virresctrl.c @@ -2120,7 +2120,7 @@ virResctrlAllocMemoryBandwidth(virResctrlInfoPtr resctrl, if (!mem_bw_alloc) return 0; - if (mem_bw_alloc && !mem_bw_info) { + if (!mem_bw_info) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("RDT Memory Bandwidth allocation unsupported")); return -1; diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c index e38ebb1f28..025321c58e 100644 --- a/tools/virsh-snapshot.c +++ b/tools/virsh-snapshot.c @@ -1208,9 +1208,8 @@ virshSnapshotListCollect(vshControl *ctl, virDomainPtr dom, /* Now that we have a count, collect the list. */ if (from && !priv->useSnapshotOld) { if (tree) { - if (count) - count = virDomainSnapshotListChildrenNames(from, names + 1, - count - 1, flags); + count = virDomainSnapshotListChildrenNames(from, names + 1, + count - 1, flags); if (count >= 0) { count++; names[0] = vshStrdup(ctl, fromname);