virkmodtest: Don't fail if modprobe doesn't exist

[libvirt] [PATCH] virkmodtest: Don't fail if modprobe doesn't exist

Michal Privoznik posted 1 patch 5 years, 2 months ago

Download mbox

Test syntax-check passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/34f516edc1b8b3a480a7e2c0121a224d3a13109b.1550158216.git.mprivozn@redhat.com

tests/virkmodtest.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

Expand all Fold all

[libvirt] [PATCH] virkmodtest: Don't fail if modprobe doesn't exist

Posted by Michal Privoznik 5 years, 2 months ago

On some very basic installations (e.g. some container images) the
modprobe binary might be missing. If that is the case, don't fail
virkmodtest.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 tests/virkmodtest.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c
index c90830a23c..80029244ff 100644
--- a/tests/virkmodtest.c
+++ b/tests/virkmodtest.c
@@ -46,7 +46,12 @@ testKModConfig(const void *args ATTRIBUTE_UNUSED)
      */
     outbuf = virKModConfig();
     if (!outbuf) {
-        fprintf(stderr, "Failed to get config\n");
+        if (virFileIsExecutable(MODPROBE)) {
+            fprintf(stderr, "Failed to get config\n");
+        } else {
+            /* modprobe doesn't exist, do not claim error. */
+            ret = 0;
+        }
         goto cleanup;
     }
     ret = 0;
-- 
2.19.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] virkmodtest: Don't fail if modprobe doesn't exist

Posted by Daniel P. Berrangé 5 years, 2 months ago

On Thu, Feb 14, 2019 at 04:30:16PM +0100, Michal Privoznik wrote:
> On some very basic installations (e.g. some container images) the
> modprobe binary might be missing. If that is the case, don't fail
> virkmodtest.
> 
> Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
> ---
>  tests/virkmodtest.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list