From 80f4183a0c817539c5805e5a28ac05bdd55c51c0 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Thu, 6 Sep 2018 18:14:55 +0200 Subject: [PATCH] qemuDomainNamespaceTeardownHostdev: Drop useless check There is no need to check if @npaths is not zero. Let's qemuDomainNamespaceUnlinkPaths() handle that. Signed-off-by: Michal Privoznik Reviewed-by: John Ferlan --- src/qemu/qemu_domain.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 05e90c3615..5329899b13 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -12476,7 +12476,8 @@ qemuDomainNamespaceUnlinkPaths(virDomainObjPtr vm, size_t i; int ret = -1; - if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) + if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT) || + !npaths) return 0; cfg = virQEMUDriverGetConfig(driver); @@ -12606,8 +12607,7 @@ qemuDomainNamespaceTeardownHostdev(virDomainObjPtr vm, &npaths, &paths, NULL) < 0) goto cleanup; - if (npaths != 0 && - qemuDomainNamespaceUnlinkPaths(vm, (const char **)paths, npaths) < 0) + if (qemuDomainNamespaceUnlinkPaths(vm, (const char **)paths, npaths) < 0) goto cleanup; ret = 0; -- 2.47.2