From nobody Mon Feb 9 11:47:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1689891735; cv=none; d=zohomail.com; s=zohoarc; b=CsMUBkmSh33ZY6F0UNNxrWLVKO7Jm/3bbe21al9g6mfhkgXwOmo2FEXX7oSmO5xdqQ9Ada6RniOOZTOGIMsOHHotBJbYzA/quJIiouooaHPdmFtFVwvyYDkPuIWiJasqx2/QOkPwYD5zx5Ykm0flTkYoTBZ/APc3vAWFC96vPE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689891735; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Fc7fhjFi55Hm3CM7ALTAQTuDwKgkKxlS9Rrz0+57Mkk=; b=hdpK+RJZOLXTXX+wfCvUZn04eMO9KEdZoAU83MGK0onYvARiaYJABPRVoSMK1AFUZqb6ermp29Y6QsJWfKrHuUoEt5VsNwEVyaReGKAqWfRlgPWpoB/9OOWq2n8pJstoZRAqGsC9USyJH89Nh1pE0UU3Tpndpy6CSL1aEfAUm8Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 16898917350711012.5438245306161; Thu, 20 Jul 2023 15:22:15 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400-jP6mdfLfOBmkTM0wYF9ANA-1; Thu, 20 Jul 2023 18:20:27 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9825B185A7AC; Thu, 20 Jul 2023 22:20:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 845CD4094DC1; Thu, 20 Jul 2023 22:20:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 35B8119451EC; Thu, 20 Jul 2023 22:20:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 8EA2C19465BD for ; Thu, 20 Jul 2023 22:20:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B64DF40C2079; Thu, 20 Jul 2023 22:20:06 +0000 (UTC) Received: from himantopus.redhat.com (unknown [10.22.8.155]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8BF0040C206F; Thu, 20 Jul 2023 22:20:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689891733; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Fc7fhjFi55Hm3CM7ALTAQTuDwKgkKxlS9Rrz0+57Mkk=; b=C6YB9wSa9YYXXPg2HWJpO0BNrmdBsUkBS7f5qRMSeJM6Fa5CCYRVrCrpMMU9MgQJXh60DE gevjZIHwsgdLIV/fn/vP9WJ1t0uZKhrGOSRtuY6awAKlFz5rgo6NNVyau0CV8XzO8PEH7U FDBBTbVgzwHpczKzbT+FWDRV0DAaovU= X-MC-Unique: jP6mdfLfOBmkTM0wYF9ANA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jonathon Jongsma To: libvir-list@redhat.com Subject: [libvirt PATCH v6 09/36] qemu: query nbdkit module dir from binary Date: Thu, 20 Jul 2023 17:19:36 -0500 Message-ID: <20230720222003.411549-10-jjongsma@redhat.com> In-Reply-To: <20230720222003.411549-1-jjongsma@redhat.com> References: <20230720222003.411549-1-jjongsma@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Krempa Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689891736934100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Rather than hard-coding the nbdkit module directory, query the nbdkit binary for the location to these directories. nbdkit provides a --dump-config optiont that outputs this information and can be easily parsed. We can also get the version from this output rather than executing `nbdkit --version` separately. Signed-off-by: Jonathon Jongsma Reviewed-by: Peter Krempa --- src/qemu/qemu_nbdkit.c | 77 ++++++++++++++++++++++++++++++++---------- 1 file changed, 60 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_nbdkit.c b/src/qemu/qemu_nbdkit.c index 2f9c5f19ef..9e53c1893e 100644 --- a/src/qemu/qemu_nbdkit.c +++ b/src/qemu/qemu_nbdkit.c @@ -20,7 +20,6 @@ #include #include =20 -#include "configmake.h" #include "vircommand.h" #include "virerror.h" #include "virlog.h" @@ -40,10 +39,6 @@ =20 VIR_LOG_INIT("qemu.nbdkit"); =20 -#define NBDKIT_MODDIR LIBDIR "/nbdkit" -#define NBDKIT_PLUGINDIR NBDKIT_MODDIR "/plugins" -#define NBDKIT_FILTERDIR NBDKIT_MODDIR "/filters" - VIR_ENUM_IMPL(qemuNbdkitCaps, QEMU_NBDKIT_CAPS_LAST, /* 0 */ @@ -57,6 +52,9 @@ struct _qemuNbdkitCaps { =20 char *path; char *version; + char *filterDir; + char *pluginDir; + time_t ctime; time_t libvirtCtime; time_t pluginDirMtime; @@ -130,18 +128,47 @@ qemuNbdkitCapsQueryFilters(qemuNbdkitCaps *nbdkit) =20 =20 static int -qemuNbdkitCapsQueryVersion(qemuNbdkitCaps *nbdkit) +qemuNbdkitCapsQueryBuildConfig(qemuNbdkitCaps *nbdkit) { + size_t i; + g_autofree char *output =3D NULL; + g_auto(GStrv) lines =3D NULL; + const char *line; g_autoptr(virCommand) cmd =3D virCommandNewArgList(nbdkit->path, - "--version", + "--dump-config", NULL); =20 - virCommandSetOutputBuffer(cmd, &nbdkit->version); + virCommandSetOutputBuffer(cmd, &output); =20 if (virCommandRun(cmd, NULL) !=3D 0) return -1; =20 - VIR_DEBUG("Got nbdkit version %s", nbdkit->version); + lines =3D g_strsplit(output, "\n", 0); + if (!lines) + return -1; + + for (i =3D 0; (line =3D lines[i]); i++) { + const char *key; + const char *val; + char *p; + + p =3D strchr(line, '=3D'); + if (!p) + continue; + + *p =3D '\0'; + key =3D line; + val =3D p + 1; + + VIR_DEBUG("Got nbdkit config value %s=3D%s", key, val); + + if (STREQ(key, "version")) + nbdkit->version =3D g_strdup(val); + else if (STREQ(key, "filterdir")) + nbdkit->filterDir =3D g_strdup(val); + else if (STREQ(key, "plugindir")) + nbdkit->pluginDir =3D g_strdup(val); + } return 0; } =20 @@ -153,6 +180,8 @@ qemuNbdkitCapsFinalize(GObject *object) =20 g_clear_pointer(&nbdkit->path, g_free); g_clear_pointer(&nbdkit->version, g_free); + g_clear_pointer(&nbdkit->filterDir, g_free); + g_clear_pointer(&nbdkit->pluginDir, g_free); g_clear_pointer(&nbdkit->flags, virBitmapFree); =20 G_OBJECT_CLASS(qemu_nbdkit_caps_parent_class)->finalize(object); @@ -215,15 +244,15 @@ qemuNbdkitCapsQuery(qemuNbdkitCaps *caps) return; } =20 + qemuNbdkitCapsQueryBuildConfig(caps); + qemuNbdkitCapsQueryPlugins(caps); + qemuNbdkitCapsQueryFilters(caps); + caps->ctime =3D st.st_ctime; - caps->filterDirMtime =3D qemuNbdkitGetDirMtime(NBDKIT_FILTERDIR); - caps->pluginDirMtime =3D qemuNbdkitGetDirMtime(NBDKIT_PLUGINDIR); + caps->filterDirMtime =3D qemuNbdkitGetDirMtime(caps->filterDir); + caps->pluginDirMtime =3D qemuNbdkitGetDirMtime(caps->pluginDir); caps->libvirtCtime =3D virGetSelfLastChanged(); caps->libvirtVersion =3D LIBVIR_VERSION_NUMBER; - - qemuNbdkitCapsQueryPlugins(caps); - qemuNbdkitCapsQueryFilters(caps); - qemuNbdkitCapsQueryVersion(caps); } =20 =20 @@ -268,9 +297,9 @@ virNbdkitCapsIsValid(void *data, if (!nbdkitCaps->path) return true; =20 - if (!virNbkditCapsCheckModdir(NBDKIT_PLUGINDIR, nbdkitCaps->pluginDirM= time)) + if (!virNbkditCapsCheckModdir(nbdkitCaps->pluginDir, nbdkitCaps->plugi= nDirMtime)) return false; - if (!virNbkditCapsCheckModdir(NBDKIT_FILTERDIR, nbdkitCaps->filterDirM= time)) + if (!virNbkditCapsCheckModdir(nbdkitCaps->filterDir, nbdkitCaps->filte= rDirMtime)) return false; =20 if (nbdkitCaps->libvirtCtime !=3D virGetSelfLastChanged() || @@ -422,12 +451,22 @@ qemuNbdkitCapsLoadCache(qemuNbdkitCaps *nbdkitCaps, } nbdkitCaps->ctime =3D (time_t)l; =20 + if ((nbdkitCaps->pluginDir =3D virXPathString("string(./plugindir)", c= txt)) =3D=3D NULL) { + VIR_DEBUG("missing plugindir in nbdkit capabilities cache"); + return -1; + } + if (virXPathLongLong("string(./plugindirmtime)", ctxt, &l) < 0) { VIR_DEBUG("missing plugindirmtime in nbdkit capabilities XML"); return -1; } nbdkitCaps->pluginDirMtime =3D (time_t)l; =20 + if ((nbdkitCaps->filterDir =3D virXPathString("string(./filterdir)", c= txt)) =3D=3D NULL) { + VIR_DEBUG("missing filterdir in nbdkit capabilities cache"); + return -1; + } + if (virXPathLongLong("string(./filterdirmtime)", ctxt, &l) < 0) { VIR_DEBUG("missing filterdirmtime in nbdkit capabilities XML"); return -1; @@ -483,8 +522,12 @@ qemuNbdkitCapsFormatCache(qemuNbdkitCaps *nbdkitCaps) nbdkitCaps->path); virBufferAsprintf(&buf, "%lu\n", nbdkitCaps->ctime); + virBufferEscapeString(&buf, "%s\n", + nbdkitCaps->pluginDir); virBufferAsprintf(&buf, "%lu\n", nbdkitCaps->pluginDirMtime); + virBufferEscapeString(&buf, "%s\n", + nbdkitCaps->filterDir); virBufferAsprintf(&buf, "%lu\n", nbdkitCaps->filterDirMtime); virBufferAsprintf(&buf, "%lu\n", --=20 2.41.0