From nobody Mon Apr 29 07:23:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1605059019; cv=none; d=zohomail.com; s=zohoarc; b=n0Vk0XNT2BnhJg3nsFamC4OxJvJBpTKPTAHo1Ai0/TJ0PhZtMIZNZDSZRvx0E1Gh2Nde/mzuQsAzBTUtW4iKTjiE7gCtnh6arGKSk5pU/GuIu3B0XlKfx4igbqzvbit7hoz6RPx8tLBGQ1Ym1C03Ai75jVNAY9yi6HkzNGKKcsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605059019; 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=Xg86FwibQI5edSpfhxciCKlVk26F+zr0lQjT5TtVv+c=; b=ApDiGlswBgZFBduuo4/Vi5Fe7TfsTSvZnwK17XtVzUZRam0yKMYN5s5dYiwh94yGcQlWRGpS6LlBK7ZH7ZLnKJgWX6r0dqiAmwicjiLxo0/vHlq49mTooWnMVAkdpJu2clrIVFZX3EQujHz1KfNIANNFGUKnAcm5SyWddJTkO6A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1605059019809365.79220700465805; Tue, 10 Nov 2020 17:43:39 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-278-FU8v3eqHPHypGqWQ2icbmg-1; Tue, 10 Nov 2020 20:43:36 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D729A5720D; Wed, 11 Nov 2020 01:43:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B486675138; Wed, 11 Nov 2020 01:43:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 74ACE180B658; Wed, 11 Nov 2020 01:43:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AB1hRdE006803 for ; Tue, 10 Nov 2020 20:43:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id 2501C5C5BB; Wed, 11 Nov 2020 01:43:27 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-135.pek2.redhat.com [10.72.13.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6EF5D5C1C4; Wed, 11 Nov 2020 01:43:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605059018; 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=Xg86FwibQI5edSpfhxciCKlVk26F+zr0lQjT5TtVv+c=; b=KCqBeEwkclGuxeyC6HPc2Gyj3oBZkSZz21sTAxIXz8D5Sp2ISfaOxfQqzTof9Kcifkjf5C H8i1/iRYurTlIc1AvHjGWGUkIeIE4Z80L+aHfcdhu5UF4ryz3wHg72ultUrbiWL0g2PBIk mtzyzIQNEVTReZMuA1sW9WQU9n1K6HA= X-MC-Unique: FU8v3eqHPHypGqWQ2icbmg-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v7 1/4] qemu_capabilities: Add QEMU_CAPS_RBD_NAMESPACE Date: Wed, 11 Nov 2020 09:42:58 +0800 Message-Id: <20201111014301.532590-2-hhan@redhat.com> In-Reply-To: <20201111014301.532590-1-hhan@redhat.com> References: <20201111014301.532590-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, pkrempa@redhat.com, Han Han X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The capability flag will be used for rbd namespace option. The rbd namespace is introduced since ceph Nautilus and qemu v5.0.0. Signed-off-by: Han Han --- src/qemu/qemu_capabilities.c | 4 ++++ src/qemu/qemu_capabilities.h | 3 +++ tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 + 8 files changed, 13 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 212ddf9206..b625463522 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -604,6 +604,9 @@ VIR_ENUM_IMPL(virQEMUCaps, "block-export-add", "netdev.vhost-vdpa", "fsdev.createmode", + + /* 385 */ + "rbd.namespace", ); =20 =20 @@ -1538,6 +1541,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSc= hemaQueries[] =3D { { "migrate-set-parameters/arg-type/xbzrle-cache-size", QEMU_CAPS_MIGRA= TION_PARAM_XBZRLE_CACHE_SIZE }, { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT }, { "netdev_add/arg-type/+vhost-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA }, + { "blockdev-add/arg-type/+rbd/namespace", QEMU_CAPS_RBD_NAMESPACE }, }; =20 typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6b40ff4f15..22037f5651 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -585,6 +585,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_NETDEV_VHOST_VDPA, /* -netdev vhost-vdpa*/ QEMU_CAPS_FSDEV_CREATEMODE, /* fsdev.createmode */ =20 + /* 385 */ + QEMU_CAPS_RBD_NAMESPACE, /* -blockdev '{"driver":"rbd",...,"namespace"= :str}' */ + QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; =20 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 8e4e888cd4..319dbec0da 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -201,6 +201,7 @@ + 5000000 0 61700241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index e0519fe7eb..1bc131a42d 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -210,6 +210,7 @@ + 5000000 0 42900241 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index c9f7a24282..e7623f792b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -197,6 +197,7 @@ + 5000000 0 0 diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0.x86_64.xml index c897bd3c63..5e12bf73d4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -245,6 +245,7 @@ + 5000000 0 43100241 diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0.x86_64.xml index 8dd48812b9..165db60f96 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -247,6 +247,7 @@ + 5001000 0 43100242 diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0.x86_64.xml index 94a1945639..167b9bff42 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -249,6 +249,7 @@ + 5001050 0 43100243 --=20 2.28.0 From nobody Mon Apr 29 07:23:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1605059026; cv=none; d=zohomail.com; s=zohoarc; b=nW4qqM8EZG+OZ2O0Gzz7bHZnK+nULZ6HrisvRi6xQYmhsXTLBODV2rIf0Szp4bY4e2VdjLP4zj59lRqh4+D1tsyVV3nqC+CP+bOjv36JAtVLCC3yXgyGyNe8AnZ5e36CyJ2HELjGstvtLC86mEbxHwq/LpSzewuAoG8RnSRTxbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605059026; 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=ExvhiTjOQN7fSuQACziObofek/W2NDbd7sU1Z60IotM=; b=Sad2tQltljtLSrBjL6a0lfhYINpDXhjVWpbmD4p4p5e3UdpIXVGYs/yg6hFNLy09vUHn6XJn8XwagBwER0ygNfg4Unlc3G5WuZoCDIim8bisYWcOaE9tyYKkJ36CzP6FmR2WO8SPdVQwob8iPbyapVOJKImXPRxKFt17WSclU70= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605059026169296.44674941098265; Tue, 10 Nov 2020 17:43:46 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-393-FDPZoBqHPySZS7SrzjFo4A-1; Tue, 10 Nov 2020 20:43:43 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9B2028049DB; Wed, 11 Nov 2020 01:43:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 76AB15DA74; Wed, 11 Nov 2020 01:43:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 42C7158100; Wed, 11 Nov 2020 01:43:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AB1hTcM006817 for ; Tue, 10 Nov 2020 20:43:29 -0500 Received: by smtp.corp.redhat.com (Postfix) id 963E45C62B; Wed, 11 Nov 2020 01:43:29 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-135.pek2.redhat.com [10.72.13.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id BBAAD5C1C4; Wed, 11 Nov 2020 01:43:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605059025; 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=ExvhiTjOQN7fSuQACziObofek/W2NDbd7sU1Z60IotM=; b=PR2ms0LahYiy5dWicqr45+FiSjXHLg+vRvZZqmMpehBVnWcgjKZNM8SxOMdcd7QKvB+bU2 k57UpoME2mfeYF1L2ePNlEEnbpEFySRWOS4sWWfm78AcaeG6Lh8sLzv3s+xLcyh+adQ8jG Ax4D3oXCQTfcMbQhC/F8GrKtecYkPfs= X-MC-Unique: FDPZoBqHPySZS7SrzjFo4A-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v7 2/4] util: Add member ns to the storage source struct Date: Wed, 11 Nov 2020 09:42:59 +0800 Message-Id: <20201111014301.532590-3-hhan@redhat.com> In-Reply-To: <20201111014301.532590-1-hhan@redhat.com> References: <20201111014301.532590-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, pkrempa@redhat.com, Han Han X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" The member ns will be used to store the namespace string. Signed-off-by: Han Han --- src/util/virstoragefile.c | 2 ++ src/util/virstoragefile.h | 1 + 2 files changed, 3 insertions(+) diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 35e6dcf5de..5d2fd70889 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -2375,6 +2375,7 @@ virStorageSourceCopy(const virStorageSource *src, =20 def->path =3D g_strdup(src->path); def->volume =3D g_strdup(src->volume); + def->ns =3D g_strdup(src->ns); def->relPath =3D g_strdup(src->relPath); def->backingStoreRaw =3D g_strdup(src->backingStoreRaw); def->backingStoreRawFormat =3D src->backingStoreRawFormat; @@ -2655,6 +2656,7 @@ virStorageSourceClear(virStorageSourcePtr def) =20 VIR_FREE(def->path); VIR_FREE(def->volume); + VIR_FREE(def->ns); VIR_FREE(def->snapshot); VIR_FREE(def->configFile); VIR_FREE(def->query); diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h index 87763cf389..8a6ddef8bf 100644 --- a/src/util/virstoragefile.h +++ b/src/util/virstoragefile.h @@ -284,6 +284,7 @@ struct _virStorageSource { char *snapshot; /* for storage systems supporting internal snapshots */ char *configFile; /* some storage systems use config file as part of the source definition */ + char *ns; /* for the storage systems supporting namespace */ char *query; /* query string for HTTP based protocols */ size_t nhosts; virStorageNetHostDefPtr hosts; --=20 2.28.0 From nobody Mon Apr 29 07:23:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1605059048; cv=none; d=zohomail.com; s=zohoarc; b=lZFYa4Wn1la0WH4QVfIUpaQKleLSi9XF1tEa3akg/ERn/qKFgm8Eo3cnugsCVMlsSGvx3JGkAs93PRwCvYnFxPb8uMopACvYJKxbsGZTR3n0qAYj8hBakXJS8g+30yLv8nNIf4iorCdwSWnBwQ87Lt5b+uHe1jeoVFP7EFGr6U8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605059048; 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=EW3ouKY9LGtasfiKLmEWS4CK0lgcqYR9h9QdwqDRG8A=; b=AAH1SdcBJmuiGdAsxnLMcqnXaEOUgp4E+1KZfLQo82fDJ4wAkANSbX55al4f3B3kGjW7qhTEoP16UGxrIETh9Dz7xIXdAW3xTJh5ZOwCkWIenY3xExk9PfaOyRe8aDu/mBUvv5Pq4ewD26J5TV10oSZchEiikseybx7RgiU8228= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605059048596406.3761683789753; Tue, 10 Nov 2020 17:44:08 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-236-cT9d2VVsOWin0JTzKINDTQ-1; Tue, 10 Nov 2020 20:43:45 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 70B711868422; Wed, 11 Nov 2020 01:43:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4EDC05C1C4; Wed, 11 Nov 2020 01:43:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 18A82180B791; Wed, 11 Nov 2020 01:43:40 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AB1hY1Z006830 for ; Tue, 10 Nov 2020 20:43:34 -0500 Received: by smtp.corp.redhat.com (Postfix) id B244D5C5BB; Wed, 11 Nov 2020 01:43:34 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-135.pek2.redhat.com [10.72.13.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 09B535C1D0; Wed, 11 Nov 2020 01:43:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605059047; 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=EW3ouKY9LGtasfiKLmEWS4CK0lgcqYR9h9QdwqDRG8A=; b=ccpAz1Xd6JtEJCl2ylr4nqWk7qpMUNKi9PHitLRfWPgvz4YQ95pd3vzP8kGLDjGc2RAWB5 Lr5mgtkYBcBt0P0hz//4Gqz18OrDossnGQ8CrLTj00u2twVmtBSrgo/uM5Z9tn/GihAP+9 8+qaaEd27MVKeC/9J+yOlT52jhOdia0= X-MC-Unique: cT9d2VVsOWin0JTzKINDTQ-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v7 3/4] conf: Support to parse rbd namespace from source name Date: Wed, 11 Nov 2020 09:43:00 +0800 Message-Id: <20201111014301.532590-4-hhan@redhat.com> In-Reply-To: <20201111014301.532590-1-hhan@redhat.com> References: <20201111014301.532590-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, pkrempa@redhat.com, Han Han X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Han Han Reviewed-by: Jason Dillaman --- docs/formatdomain.rst | 16 ++++++++++++++ src/conf/domain_conf.c | 47 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index a6ab845f92..2b760e6a39 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2409,6 +2409,16 @@ paravirtualized driver is specified via the ``disk``= element. + + + + + + + + + + ... =20 @@ -2500,6 +2510,12 @@ paravirtualized driver is specified via the ``disk``= element. the host by the ``nbd_tls`` and ``nbd_tls_x509_cert_dir`` in /etc/libvirt/qemu.conf. ('tls' :since:`Since 4.5.0` ) =20 + For "rbd", the ``name`` attribute could be two formats: the format of + ``pool_name/image_name`` includes the rbd pool name and image name w= ith + default rbd pool namespace; for the customized namespace, the format= is + ``pool_name/namespace/image_name`` ( :since:`Since 6.9.0 and QEMU 5.= 0` ). + The pool name, namespace and image are separated by slash. + For protocols ``http`` and ``https`` an optional attribute ``query`` specifies the query string. ( :since:`Since 6.2.0` ) =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d84d0327ad..a337051e30 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9554,6 +9554,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, g_autofree char *tlsCfg =3D NULL; g_autofree char *sslverifystr =3D NULL; xmlNodePtr tmpnode; + char **tmp_split_paths; =20 if (!(protocol =3D virXMLPropString(node, "protocol"))) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -9595,8 +9596,7 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, /* for historical reasons we store the volume and image name in one XML * element although it complicates thing when attempting to access the= m. */ if (src->path && - (src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_GLUSTER || - src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_RBD)) { + src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_GLUSTER) { char *tmp; if (!(tmp =3D strchr(src->path, '/')) || tmp =3D=3D src->path) { @@ -9613,6 +9613,41 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node, tmp[0] =3D '\0'; } =20 + /* the name of rbd could be / or // */ + if (src->path && + src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_RBD && + (tmp_split_paths =3D virStringSplit(src->path, "/", 3))) { + if (virStringIsEmpty(tmp_split_paths[0]) || + !tmp_split_paths[1] || + STREQ_NULLABLE(tmp_split_paths[2], "") || + (virStringIsEmpty(tmp_split_paths[1]) && + !tmp_split_paths[2])) { + virStringListFreeCount(tmp_split_paths, 3); + virReportError(VIR_ERR_XML_ERROR, + _("can't split path '%s' into pool name, pool " + "namespace, image name OR pool name, image na= me"), + src->path); + return -1; + } + + VIR_FREE(src->path); + src->volume =3D g_strdup(tmp_split_paths[0]); + /* the format of / */ + if (!tmp_split_paths[2]) + src->path =3D g_strdup(tmp_split_paths[1]); + + if (tmp_split_paths[2]) { + /* the format of // */ + if (STRNEQ_NULLABLE(tmp_split_paths[1], "")) + src->ns =3D g_strdup(tmp_split_paths[1]); + + /* the format of // */ + src->path =3D g_strdup(tmp_split_paths[2]); + } + + virStringListFreeCount(tmp_split_paths, 3); + } + /* snapshot currently works only for remote disks */ src->snapshot =3D virXPathString("string(./snapshot/@name)", ctxt); =20 @@ -25351,8 +25386,12 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attr= Buf, virBufferAsprintf(attrBuf, " protocol=3D'%s'", virStorageNetProtocolTypeToString(src->protocol)); =20 - if (src->volume) - path =3D g_strdup_printf("%s/%s", src->volume, src->path); + if (src->volume) { + if (src->ns) + path =3D g_strdup_printf("%s/%s/%s", src->volume, src->ns, src= ->path); + else + path =3D g_strdup_printf("%s/%s", src->volume, src->path); + } =20 virBufferEscapeString(attrBuf, " name=3D'%s'", path ? path : src->path= ); virBufferEscapeString(attrBuf, " query=3D'%s'", src->query); --=20 2.28.0 From nobody Mon Apr 29 07:23:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.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=1605059044; cv=none; d=zohomail.com; s=zohoarc; b=hFbl3jG4hwMUd1pu6qd4oAcniNgZLWEIycfeitUS5Q3PtlCfkTpkpRLM6sSEjz4gFWndNH8B/21touTihnZBCjzhbV91b2jndfIflFJUG6tTe0VzqV+Tu1eZuS/fyUAVMm4UnxJh3FbywgxQD6+J1fYzIU52FMuG7TLCH5CNtE0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1605059044; 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=Jkg05cfyAV38ut9vC/iQZqLZt6W0JSmYsdTnsrDP3eE=; b=KE6VSJT+Fc4PZ4CgulJ0GMPzCHkShCxASEVfuHdjAFPQJ1pG9qsVGaII+m5HdJTX4UmS/3f7TY8kOabPv/G+rUWPFEJgzWKNzethIFEy+6Ew6W9VidUbKZPCY78kaLHRgwTekdJwcilxDDe4m2e/ea6DnkDCwCmTlHhBRdiO/XI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1605059044645909.04427318655; Tue, 10 Nov 2020 17:44:04 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-102--pPuaP3hPW-QzZ-ykbcKkw-1; Tue, 10 Nov 2020 20:43:45 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 299631074657; Wed, 11 Nov 2020 01:43:40 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 01ED67513E; Wed, 11 Nov 2020 01:43:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id AC6975810D; Wed, 11 Nov 2020 01:43:39 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AB1hb0W006851 for ; Tue, 10 Nov 2020 20:43:37 -0500 Received: by smtp.corp.redhat.com (Postfix) id 9E7155C269; Wed, 11 Nov 2020 01:43:37 +0000 (UTC) Received: from localhost.localdomain (ovpn-13-135.pek2.redhat.com [10.72.13.135]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52AAB5C1D0; Wed, 11 Nov 2020 01:43:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605059043; 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=Jkg05cfyAV38ut9vC/iQZqLZt6W0JSmYsdTnsrDP3eE=; b=HnqZxNVQCxtndhZVumDfHjjEQASxWqEgVpG2Kuoug1iNVBM2evY88/VCmbUcRbEEcXyAYT EvqKoxuD/vnvoy2/NRfhjnqXhPRxBndP0NV3HqruCDi+VCsTErLaB9z9WIsiV3gY4tknuH 7NIfBmrNPaYeO1nWF9s2GvKJ90uAxSc= X-MC-Unique: -pPuaP3hPW-QzZ-ykbcKkw-1 From: Han Han To: libvir-list@redhat.com Subject: [PATCH v7 4/4] qemu: Implement rbd namespace to the source name attribute Date: Wed, 11 Nov 2020 09:43:01 +0800 Message-Id: <20201111014301.532590-5-hhan@redhat.com> In-Reply-To: <20201111014301.532590-1-hhan@redhat.com> References: <20201111014301.532590-1-hhan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: mprivozn@redhat.com, pkrempa@redhat.com, Han Han X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since Nautilus ceph supports separate image namespaces within a pool for tenant isolation and QEMU adds it as a rbd blockdev options from 5.0.0. The source name with format "//" could be used to access a rbd image with namespace. Add unit tests for this attribute. https://bugzilla.redhat.com/show_bug.cgi?id=3D1816909 Signed-off-by: Han Han --- src/qemu/qemu_block.c | 1 + src/qemu/qemu_domain.c | 8 +++ ...k-network-rbd-namespace.x86_64-latest.args | 49 +++++++++++++++++++ .../disk-network-rbd-namespace.xml | 40 +++++++++++++++ tests/qemuxml2argvtest.c | 1 + ...sk-network-rbd-namespace.x86_64-latest.xml | 49 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 7 files changed, 149 insertions(+) create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-namespace.x86_6= 4-latest.args create mode 100644 tests/qemuxml2argvdata/disk-network-rbd-namespace.xml create mode 100644 tests/qemuxml2xmloutdata/disk-network-rbd-namespace.x86= _64-latest.xml diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 4640e339c0..a1d85d3794 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -870,6 +870,7 @@ qemuBlockStorageSourceGetRBDProps(virStorageSourcePtr s= rc, "s:pool", src->volume, "s:image", src->path, "S:snapshot", src->snapshot, + "S:namespace", src->ns, "S:conf", src->configFile, "A:server", &servers, "S:user", username, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 02b5e7422c..9c21f564ce 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4628,6 +4628,14 @@ qemuDomainValidateStorageSource(virStorageSourcePtr = src, return -1; } =20 + if (src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_RBD && + src->ns && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_RBD_NAMESPACE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("rbd namespace is not supported by this QEMU")); + return -1; + } + return 0; } =20 diff --git a/tests/qemuxml2argvdata/disk-network-rbd-namespace.x86_64-lates= t.args b/tests/qemuxml2argvdata/disk-network-rbd-namespace.x86_64-latest.ar= gs new file mode 100644 index 0000000000..49b3dd53f6 --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-rbd-namespace.x86_64-latest.args @@ -0,0 +1,49 @@ +LC_ALL=3DC \ +PATH=3D/bin \ +HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ +USER=3Dtest \ +LOGNAME=3Dtest \ +XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ +QEMU_AUDIO_DRV=3Dnone \ +/usr/bin/qemu-system-x86_64 \ +-name guest=3DQEMUGuest1,debug-threads=3Don \ +-S \ +-object secret,id=3DmasterKey0,format=3Draw,\ +file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dp= c.ram \ +-cpu qemu64 \ +-m 214 \ +-object memory-backend-ram,id=3Dpc.ram,size=3D224395264 \ +-overcommit mem-lock=3Doff \ +-smp 1,sockets=3D1,cores=3D1,threads=3D1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=3Dcharmonitor,fd=3D1729,server,nowait \ +-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ +-rtc base=3Dutc \ +-no-shutdown \ +-no-acpi \ +-boot strict=3Don \ +-device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image","namespace":"ns",\ +"server":[{"host":"mon1.example.org","port":"6321"},{"host":"mon2.example.= org",\ +"port":"6322"},{"host":"mon3.example.org","port":"6322"}],\ +"node-name":"libvirt-2-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-2-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-2-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x2,drive=3Dlibvirt-2-format,\ +id=3Dvirtio-disk0,bootindex=3D1 \ +-blockdev '{"driver":"rbd","pool":"pool","image":"image",\ +"server":[{"host":"mon1.example.org","port":"6321"}],\ +"node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw= ",\ +"file":"libvirt-1-storage"}' \ +-device virtio-blk-pci,bus=3Dpci.0,addr=3D0x3,drive=3Dlibvirt-1-format,\ +id=3Dvirtio-disk1 \ +-sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,\ +resourcecontrol=3Ddeny \ +-msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/disk-network-rbd-namespace.xml b/tests/= qemuxml2argvdata/disk-network-rbd-namespace.xml new file mode 100644 index 0000000000..5389cbda2f --- /dev/null +++ b/tests/qemuxml2argvdata/disk-network-rbd-namespace.xml @@ -0,0 +1,40 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ec33134a97..83f8f8f01f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1232,6 +1232,7 @@ mymain(void) DO_TEST_CAPS_VER("disk-network-rbd", "2.5.0"); DO_TEST_CAPS_VER("disk-network-rbd", "2.12.0"); DO_TEST_CAPS_LATEST("disk-network-rbd"); + DO_TEST_CAPS_LATEST("disk-network-rbd-namespace"); DO_TEST_FAILURE("disk-network-rbd-no-colon", NONE); DO_TEST("disk-network-sheepdog", NONE); DO_TEST_CAPS_VER("disk-network-sheepdog", "2.12.0"); diff --git a/tests/qemuxml2xmloutdata/disk-network-rbd-namespace.x86_64-lat= est.xml b/tests/qemuxml2xmloutdata/disk-network-rbd-namespace.x86_64-latest= .xml new file mode 100644 index 0000000000..8bc26e2764 --- /dev/null +++ b/tests/qemuxml2xmloutdata/disk-network-rbd-namespace.x86_64-latest.xml @@ -0,0 +1,49 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + qemu64 + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + + + + + + + + +
+ + + + + + + +
+ + +
+ + +
+ + + + + + + diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c006719dee..b3f25f2751 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -297,6 +297,7 @@ mymain(void) QEMU_CAPS_SCSI_BLOCK); DO_TEST("disk-network-gluster", NONE); DO_TEST("disk-network-rbd", NONE); + DO_TEST_CAPS_ARCH_LATEST("disk-network-rbd-namespace", "x86_64"); DO_TEST("disk-network-source-auth", NONE); DO_TEST("disk-network-sheepdog", NONE); DO_TEST("disk-network-vxhs", NONE); --=20 2.28.0