From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236715688539.2565087029578;
 Wed, 21 Feb 2018 10:11:55 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 0AACD12E07A;
	Wed, 21 Feb 2018 18:11:53 +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 AA59B60CAD;
	Wed, 21 Feb 2018 18:11:51 +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 F06F54A46C;
	Wed, 21 Feb 2018 18:11:48 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBjbo026214 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:45 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 3994810A971C; Wed, 21 Feb 2018 18:11:45 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9C49210A971B;
	Wed, 21 Feb 2018 18:11:44 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:26 +0100
Message-Id: 
 <b6c6e1acdb50644c52b36770e46682966c82abcc.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 01/12] virstoragefile: Introduce virStoragePRDef
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Wed, 21 Feb 2018 18:11:54 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

This is a definition that holds information on SCSI persistent
reservation settings. The XML part looks like this:

  <reservations enabled=3D'yes' managed=3D'no'>
    <source type=3D'unix' path=3D'/path/to/qemu-pr-helper.sock' mode=3D'cli=
ent'/>
  </reservations>

If @managed is set to 'yes' then the <source/> is not parsed.
This design was agreed on here:

https://www.redhat.com/archives/libvir-list/2017-November/msg01005.html

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 docs/formatdomain.html.in                          |  25 +++-
 docs/schemas/domaincommon.rng                      |  34 +----
 docs/schemas/storagecommon.rng                     |  50 +++++++
 src/conf/domain_conf.c                             |  36 +++++
 src/libvirt_private.syms                           |   3 +
 src/util/virstoragefile.c                          | 148 +++++++++++++++++=
++++
 src/util/virstoragefile.h                          |  15 +++
 .../disk-virtio-scsi-reservations-not-managed.xml  |  40 ++++++
 .../disk-virtio-scsi-reservations.xml              |  38 ++++++
 .../disk-virtio-scsi-reservations-not-managed.xml  |   1 +
 .../disk-virtio-scsi-reservations.xml              |   1 +
 tests/qemuxml2xmltest.c                            |   4 +
 12 files changed, 364 insertions(+), 31 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-no=
t-managed.xml
 create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
 create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-=
not-managed.xml
 create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.=
xml

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 6fd2189cd..cbdc887a0 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2563,7 +2563,10 @@
   &lt;/disk&gt;
   &lt;disk type=3D'block' device=3D'lun'&gt;
     &lt;driver name=3D'qemu' type=3D'raw'/&gt;
-    &lt;source dev=3D'/dev/sda'/&gt;
+    &lt;source dev=3D'/dev/sda'&gt;
+      &lt;reservations enabled=3D'yes' managed=3D'no'&gt;
+        &lt;source type=3D'unix' path=3D'/path/to/qemu-pr-helper' mode=3D'=
client'/&gt;
+      &lt;/reservations&gt;
     &lt;target dev=3D'sda' bus=3D'scsi'/&gt;
     &lt;address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'3' uni=
t=3D'0'/&gt;
   &lt;/disk&gt;
@@ -2926,6 +2929,26 @@
             <a href=3D"formatstorageencryption.html">Storage Encryption</a>
             page for more information.
           </dd>
+          <dt><code>reservations</code></dt>
+          <dd><span class=3D"since">Since libvirt 4.1.0</span>, the
+            <code>reservations</code> can be a sub-element of the
+            <code>source</code> element for storage sources (QEMU driver o=
nly).
+            If present (and enabled) it enabled persistent reservations for
+            SCSI based disks. The element has one mandatory attribute
+            <code>enabled</code> with accepted values <code>yes</code> and
+            <code>no</code>. If the feature is enabled, then there's anoth=
er
+            mandatory attribute <code>managed</code> (accepted values are =
the
+            same as for <code>enabled</code>) that enables or disables lib=
virt
+            spawning any helper process (should one be needed). However, if
+            libvirt is not enabled spawning helper process (i.e. hypervisor
+            should just use one which is already running), path to its soc=
ket
+            must be provided in child element <code>source</code>, which
+            currently accepts only the following attributes: <code>type</c=
ode>
+            with one value <code>unix</code>, <code>path</code> with path =
the
+            socket, and finally <code>mode</code> which accepts either
+            <code>server</code> or <code>client</code> and specifies the r=
ole
+            of hypervisor.
+          </dd>
         </dl>
=20
         <p>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 8165e699d..198d4400b 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -1530,6 +1530,9 @@
         <optional>
           <ref name=3D"encryption"/>
         </optional>
+        <optional>
+          <ref name=3D"reservations"/>
+        </optional>
         <zeroOrMore>
           <ref name=3D'devSeclabel'/>
         </zeroOrMore>
@@ -2431,18 +2434,6 @@
       </attribute>
     </optional>
   </define>
-  <define name=3D"reconnect">
-    <element name=3D"reconnect">
-      <attribute name=3D"enabled">
-        <ref name=3D"virYesNo"/>
-      </attribute>
-      <optional>
-        <attribute name=3D"timeout">
-          <ref name=3D"unsignedInt"/>
-        </attribute>
-      </optional>
-    </element>
-  </define>
=20
   <!--
       An interface description can either be of type bridge in which case
@@ -2491,24 +2482,7 @@
             <value>vhostuser</value>
           </attribute>
           <interleave>
-            <element name=3D"source">
-              <attribute name=3D"type">
-                <value>unix</value>
-              </attribute>
-              <attribute name=3D"path">
-                <ref name=3D"absFilePath"/>
-              </attribute>
-              <attribute name=3D"mode">
-                <choice>
-                  <value>server</value>
-                  <value>client</value>
-                </choice>
-              </attribute>
-              <optional>
-                 <ref name=3D"reconnect"/>
-              </optional>
-              <empty/>
-            </element>
+            <ref name=3D"unixSocketSource"/>
             <ref name=3D"interface-options"/>
           </interleave>
         </group>
diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng
index edee1b084..eed0b3334 100644
--- a/docs/schemas/storagecommon.rng
+++ b/docs/schemas/storagecommon.rng
@@ -39,6 +39,56 @@
     </element>
   </define>
=20
+  <define name=3D"reconnect">
+    <element name=3D"reconnect">
+      <attribute name=3D"enabled">
+        <ref name=3D"virYesNo"/>
+      </attribute>
+      <optional>
+        <attribute name=3D"timeout">
+          <ref name=3D"unsignedInt"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+
+  <define name=3D'unixSocketSource'>
+    <element name=3D"source">
+      <attribute name=3D"type">
+        <value>unix</value>
+      </attribute>
+      <attribute name=3D"path">
+        <ref name=3D"absFilePath"/>
+      </attribute>
+      <attribute name=3D"mode">
+        <choice>
+          <value>server</value>
+          <value>client</value>
+        </choice>
+      </attribute>
+      <optional>
+         <ref name=3D"reconnect"/>
+      </optional>
+      <empty/>
+    </element>
+  </define>
+
+  <define name=3D'reservations'>
+    <element name=3D'reservations'>
+      <attribute name=3D'enabled'>
+        <ref name=3D'virYesNo'/>
+      </attribute>
+      <optional>
+        <attribute name=3D'managed'>
+          <ref name=3D'virYesNo'/>
+        </attribute>
+      </optional>
+      <optional>
+        <ref name=3D'unixSocketSource'/>
+      </optional>
+    </element>
+  </define>
+
   <define name=3D'secret'>
     <element name=3D'secret'>
       <attribute name=3D'type'>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f2ddde7a3..a1a6b0162 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5199,6 +5199,13 @@ virDomainDiskDefValidate(const virDomainDiskDef *dis=
k)
         }
     }
=20
+    if (disk->src->pr &&
+        disk->device !=3D VIR_DOMAIN_DISK_DEVICE_LUN) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("<reservations/> allowed only for lun disks"));
+        return -1;
+    }
+
     /* Reject disks with a bus type that is not compatible with the
      * given address type. The function considers only buses that are
      * handled in common code. For other bus types it's not possible
@@ -8613,6 +8620,29 @@ virDomainDiskSourcePrivateDataParse(xmlXPathContextP=
tr ctxt,
 }
=20
=20
+static int
+virDomainDiskSourcePRParse(xmlNodePtr node,
+                           virStoragePRDefPtr *prsrc)
+{
+    xmlNodePtr child;
+    virStoragePRDefPtr pr =3D NULL;
+
+    for (child =3D node->children; child; child =3D child->next) {
+        if (child->type =3D=3D XML_ELEMENT_NODE &&
+            virXMLNodeNameEqual(child, "reservations")) {
+
+            if (!(pr =3D virStoragePRDefParseNode(node->doc, child)))
+                return -1;
+
+            *prsrc =3D pr;
+            return 0;
+        }
+    }
+
+    return 0;
+}
+
+
 int
 virDomainDiskSourceParse(xmlNodePtr node,
                          xmlXPathContextPtr ctxt,
@@ -8657,6 +8687,9 @@ virDomainDiskSourceParse(xmlNodePtr node,
     if (virDomainDiskSourceEncryptionParse(node, &src->encryption) < 0)
         goto cleanup;
=20
+    if (virDomainDiskSourcePRParse(node, &src->pr) < 0)
+        goto cleanup;
+
     if (virDomainDiskSourcePrivateDataParse(ctxt, src, flags, xmlopt) < 0)
         goto cleanup;
=20
@@ -22940,6 +22973,9 @@ virDomainDiskSourceFormatInternal(virBufferPtr buf,
             virStorageEncryptionFormat(&childBuf, src->encryption) < 0)
             goto error;
=20
+        if (src->pr)
+            virStoragePRDefFormat(&childBuf, src->pr);
+
         if (virDomainDiskSourceFormatPrivateData(&childBuf, src, flags, xm=
lopt) < 0)
             goto error;
=20
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 03f23dbab..071642c00 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2779,6 +2779,9 @@ virStorageNetHostDefFree;
 virStorageNetHostTransportTypeFromString;
 virStorageNetHostTransportTypeToString;
 virStorageNetProtocolTypeToString;
+virStoragePRDefFormat;
+virStoragePRDefFree;
+virStoragePRDefParseNode;
 virStorageSourceBackingStoreClear;
 virStorageSourceClear;
 virStorageSourceCopy;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index d1972d6d1..833d69f6d 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1911,6 +1911,153 @@ virStorageAuthDefFormat(virBufferPtr buf,
 }
=20
=20
+void
+virStoragePRDefFree(virStoragePRDefPtr prd)
+{
+    if (!prd)
+        return;
+
+    VIR_FREE(prd->path);
+    VIR_FREE(prd);
+}
+
+
+static virStoragePRDefPtr
+virStoragePRDefParseXML(xmlXPathContextPtr ctxt)
+{
+    virStoragePRDefPtr prd, ret =3D NULL;
+    char *enabled =3D NULL;
+    char *managed =3D NULL;
+    char *type =3D NULL;
+    char *path =3D NULL;
+    char *mode =3D NULL;
+
+    if (VIR_ALLOC(prd) < 0)
+        return NULL;
+
+    if (!(enabled =3D virXPathString("string(./@enabled)", ctxt))) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("missing @enabled attribute for <reservations/>")=
);
+        goto cleanup;
+    }
+
+    if ((prd->enabled =3D virTristateBoolTypeFromString(enabled)) <=3D 0) {
+        virReportError(VIR_ERR_XML_ERROR,
+                       _("invalid value for 'enabled': %s"), NULLSTR(enabl=
ed));
+        goto cleanup;
+    }
+
+    if (prd->enabled =3D=3D VIR_TRISTATE_BOOL_YES) {
+        managed =3D virXPathString("string(./@managed)", ctxt);
+        if ((prd->managed =3D virTristateBoolTypeFromString(managed)) <=3D=
 0) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("invalid value for 'managed': %s"), NULLSTR(m=
anaged));
+            goto cleanup;
+        }
+
+        if (prd->managed =3D=3D VIR_TRISTATE_BOOL_NO) {
+            type =3D virXPathString("string(./source[1]/@type)", ctxt);
+            path =3D virXPathString("string(./source[1]/@path)", ctxt);
+            mode =3D virXPathString("string(./source[1]/@mode)", ctxt);
+
+            if (!type) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("missing connection type"));
+                goto cleanup;
+            }
+
+            if (!path) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("missing path"));
+                goto cleanup;
+            }
+
+            if (!mode) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("missing connection mode"));
+                goto cleanup;
+            }
+
+            if (STRNEQ(type, "unix")) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("unsupported type: %s"), type);
+                goto cleanup;
+            }
+
+            if (STRNEQ(mode, "client")) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("unsupported mode: %s"),  mode);
+                goto cleanup;
+            }
+
+            prd->path =3D path;
+            path =3D NULL;
+
+        }
+    }
+
+    ret =3D prd;
+    prd =3D NULL;
+
+ cleanup:
+    VIR_FREE(mode);
+    VIR_FREE(path);
+    VIR_FREE(type);
+    VIR_FREE(managed);
+    VIR_FREE(enabled);
+    virStoragePRDefFree(prd);
+    return ret;
+}
+
+
+virStoragePRDefPtr
+virStoragePRDefParseNode(xmlDocPtr xml,
+                         xmlNodePtr root)
+{
+    xmlXPathContextPtr ctxt =3D NULL;
+    virStoragePRDefPtr prd =3D NULL;
+
+    ctxt =3D xmlXPathNewContext(xml);
+    if (ctxt =3D=3D NULL) {
+        virReportOOMError();
+        goto cleanup;
+    }
+
+    ctxt->node =3D root;
+    prd =3D virStoragePRDefParseXML(ctxt);
+
+ cleanup:
+    xmlXPathFreeContext(ctxt);
+    return prd;
+}
+
+
+void
+virStoragePRDefFormat(virBufferPtr buf,
+                      virStoragePRDefPtr prd)
+{
+    virBufferAsprintf(buf, "<reservations enabled=3D'%s'",
+                      virTristateBoolTypeToString(prd->enabled));
+    if (prd->enabled =3D=3D VIR_TRISTATE_BOOL_YES) {
+        virBufferAsprintf(buf, " managed=3D'%s'",
+                          virTristateBoolTypeToString(prd->managed));
+        if (prd->managed =3D=3D VIR_TRISTATE_BOOL_NO) {
+            virBufferAddLit(buf, ">\n");
+            virBufferAdjustIndent(buf, 2);
+            virBufferAddLit(buf, "<source type=3D'unix'");
+            virBufferEscapeString(buf, " path=3D'%s'", prd->path);
+            virBufferAddLit(buf, " mode=3D'client'/>\n");
+            virBufferAdjustIndent(buf, -2);
+            virBufferAddLit(buf, "</reservations>\n");
+        } else {
+            virBufferAddLit(buf, "/>\n");
+        }
+    } else {
+        virBufferAddLit(buf, "/>\n");
+    }
+}
+
+
 virSecurityDeviceLabelDefPtr
 virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src,
                                     const char *model)
@@ -2289,6 +2436,7 @@ virStorageSourceClear(virStorageSourcePtr def)
     virBitmapFree(def->features);
     VIR_FREE(def->compat);
     virStorageEncryptionFree(def->encryption);
+    virStoragePRDefFree(def->pr);
     virStorageSourceSeclabelsClear(def);
     virStoragePermsFree(def->perms);
     VIR_FREE(def->timestamps);
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 0095cd138..968653660 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -216,6 +216,14 @@ struct _virStorageAuthDef {
     virSecretLookupTypeDef seclookupdef;
 };
=20
+typedef struct _virStoragePRDef virStoragePRDef;
+typedef virStoragePRDef *virStoragePRDefPtr;
+struct _virStoragePRDef {
+    int enabled; /* enum virTristateBool */
+    int managed; /* enum virTristateBool */
+    char *path;
+};
+
 typedef struct _virStorageDriverData virStorageDriverData;
 typedef virStorageDriverData *virStorageDriverDataPtr;
=20
@@ -243,6 +251,7 @@ struct _virStorageSource {
     bool authInherited;
     virStorageEncryptionPtr encryption;
     bool encryptionInherited;
+    virStoragePRDefPtr pr;
=20
     virObjectPtr privateData;
=20
@@ -369,6 +378,12 @@ virStorageAuthDefPtr virStorageAuthDefCopy(const virSt=
orageAuthDef *src);
 virStorageAuthDefPtr virStorageAuthDefParse(xmlDocPtr xml, xmlNodePtr root=
);
 void virStorageAuthDefFormat(virBufferPtr buf, virStorageAuthDefPtr authde=
f);
=20
+void virStoragePRDefFree(virStoragePRDefPtr prd);
+virStoragePRDefPtr virStoragePRDefParseNode(xmlDocPtr xml,
+                                            xmlNodePtr root);
+void virStoragePRDefFormat(virBufferPtr buf,
+                           virStoragePRDefPtr prd);
+
 virSecurityDeviceLabelDefPtr
 virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src,
                                     const char *model);
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-manag=
ed.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.x=
ml
new file mode 100644
index 000000000..8ee623a70
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.xml
@@ -0,0 +1,40 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>8</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <disk type=3D'block' device=3D'lun'>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'>
+        <reservations enabled=3D'yes' managed=3D'no'>
+          <source type=3D'unix' path=3D'/path/to/qemu-pr-helper.sock' mode=
=3D'client'/>
+        </reservations>
+      </source>
+      <target dev=3D'sdb' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver queues=3D'8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml b/tes=
ts/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
new file mode 100644
index 000000000..874446f7b
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
@@ -0,0 +1,38 @@
+<domain type=3D'qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit=3D'KiB'>219136</memory>
+  <currentMemory unit=3D'KiB'>219136</currentMemory>
+  <vcpu placement=3D'static'>8</vcpu>
+  <os>
+    <type arch=3D'i686' machine=3D'pc'>hvm</type>
+    <boot dev=3D'hd'/>
+  </os>
+  <clock offset=3D'utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i686</emulator>
+    <disk type=3D'block' device=3D'lun'>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'>
+        <reservations enabled=3D'yes' managed=3D'yes'/>
+      </source>
+      <target dev=3D'sdb' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <controller type=3D'usb' index=3D'0'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x2'/>
+    </controller>
+    <controller type=3D'scsi' index=3D'0' model=3D'virtio-scsi'>
+      <driver queues=3D'8'/>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x03' f=
unction=3D'0x0'/>
+    </controller>
+    <controller type=3D'pci' index=3D'0' model=3D'pci-root'/>
+    <input type=3D'mouse' bus=3D'ps2'/>
+    <input type=3D'keyboard' bus=3D'ps2'/>
+    <memballoon model=3D'virtio'>
+      <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x04' f=
unction=3D'0x0'/>
+    </memballoon>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-not-man=
aged.xml b/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-not-manag=
ed.xml
new file mode 120000
index 000000000..f96d62cb6
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations-not-managed.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml b/t=
ests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml
new file mode 120000
index 000000000..dde52fd1d
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/disk-virtio-scsi-reservations.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 0eb9e6c77..58cbf8438 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -531,6 +531,10 @@ mymain(void)
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-num_queues",
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("disk-virtio-scsi-reservations",
+            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("disk-virtio-scsi-reservations-not-managed",
+            QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-cmd_per_lun",
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-max_sectors",
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236734825320.9610943492735;
 Wed, 21 Feb 2018 10:12:14 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 026025313F;
	Wed, 21 Feb 2018 18:12:13 +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 A0342608F6;
	Wed, 21 Feb 2018 18:12:12 +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 6975F18033ED;
	Wed, 21 Feb 2018 18:12:12 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBkD0026220 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:46 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id E74A210A971D; Wed, 21 Feb 2018 18:11:45 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7252A10A971B;
	Wed, 21 Feb 2018 18:11:45 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:27 +0100
Message-Id: 
 <9a1da4720910d834baf641e7e29650db0f7ccf34.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 02/12] qemuDomainDiskChangeSupported: Deny
	changing reservations
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Wed, 21 Feb 2018 18:12:13 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Couple of reasons for that:

a) there's no monitor command to change path where the pr-helper
connects to, or
b) there's no monitor command to introduce a new pr-helper for a
disk that already exists.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/libvirt_private.syms  |  1 +
 src/qemu/qemu_domain.c    |  8 ++++++++
 src/util/virstoragefile.c | 18 ++++++++++++++++++
 src/util/virstoragefile.h |  2 ++
 4 files changed, 29 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 071642c00..d4bff0f0b 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2781,6 +2781,7 @@ virStorageNetHostTransportTypeToString;
 virStorageNetProtocolTypeToString;
 virStoragePRDefFormat;
 virStoragePRDefFree;
+virStoragePRDefIsEqual;
 virStoragePRDefParseNode;
 virStorageSourceBackingStoreClear;
 virStorageSourceClear;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8b4efc82d..de8974d66 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7480,6 +7480,14 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr di=
sk,
     CHECK_EQ(src->readonly, "readonly", true);
     CHECK_EQ(src->shared, "shared", true);
=20
+    if (!virStoragePRDefIsEqual(disk->src->pr,
+                                orig_disk->src->pr)) {
+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                       _("cannot modify field '%s' of the disk"),
+                       "reservations");
+        return false;
+    }
+
 #undef CHECK_EQ
=20
     return true;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 833d69f6d..328f59788 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2058,6 +2058,24 @@ virStoragePRDefFormat(virBufferPtr buf,
 }
=20
=20
+bool
+virStoragePRDefIsEqual(virStoragePRDefPtr a,
+                       virStoragePRDefPtr b)
+{
+    if (!a && !b)
+        return true;
+
+    if (!a || !b)
+        return false;
+
+    if (a->enabled !=3D b->enabled ||
+        a->managed !=3D b->managed ||
+        STRNEQ_NULLABLE(a->path, b->path))
+        return false;
+
+    return true;
+}
+
 virSecurityDeviceLabelDefPtr
 virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src,
                                     const char *model)
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index 968653660..e70c99076 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -383,6 +383,8 @@ virStoragePRDefPtr virStoragePRDefParseNode(xmlDocPtr x=
ml,
                                             xmlNodePtr root);
 void virStoragePRDefFormat(virBufferPtr buf,
                            virStoragePRDefPtr prd);
+bool virStoragePRDefIsEqual(virStoragePRDefPtr a,
+                            virStoragePRDefPtr b);
=20
 virSecurityDeviceLabelDefPtr
 virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src,
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236738760242.7633515049447;
 Wed, 21 Feb 2018 10:12:18 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 09B02D1FFA;
	Wed, 21 Feb 2018 18:12:17 +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 CBB60620D9;
	Wed, 21 Feb 2018 18:12:16 +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 8D7DD4A475;
	Wed, 21 Feb 2018 18:12:16 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBksW026231 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:46 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id A0D7710A971D; Wed, 21 Feb 2018 18:11:46 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 2BD1B10A971B;
	Wed, 21 Feb 2018 18:11:46 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:28 +0100
Message-Id: 
 <cc49ee43c0e09bb7862f12af96dcba9d184d9597.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 03/12] qemu: Introduce pr-manager-helper
	capability
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Wed, 21 Feb 2018 18:12:17 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

The capability tracks if qemu has pr-manager-helper object. At
this time don't actually detect if qemu has the capability. Not
just yet. Only after the code is written the feature will be
enabled.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_capabilities.c | 1 +
 src/qemu/qemu_capabilities.h | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index b5eb8cf46..d0005c71d 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -459,6 +459,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               "pl011",
               "machine.pseries.max-cpu-compat",
               "dump-completed",
+              "pr-manager-helper",
     );
=20
=20
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index c2ec2be19..8d315665a 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -444,6 +444,7 @@ typedef enum {
     QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
     QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-=
compat=3D */
     QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */
+    QEMU_CAPS_PR_MANAGER_HELPER, /* -object pr-manager-helper */
=20
     QEMU_CAPS_LAST /* this must always be the last item */
 } virQEMUCapsFlags;
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236743355582.2012615189078;
 Wed, 21 Feb 2018 10:12:23 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id EE113C0FACD5;
	Wed, 21 Feb 2018 18:12:21 +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 BC88F60BEE;
	Wed, 21 Feb 2018 18:12:21 +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 750924A479;
	Wed, 21 Feb 2018 18:12:21 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBlGm026237 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:47 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 5A5B310A971C; Wed, 21 Feb 2018 18:11:47 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id D96A910A971B;
	Wed, 21 Feb 2018 18:11:46 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:29 +0100
Message-Id: 
 <bedfb77c87fb83c044ccce0036cf2aa79f9c4974.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 04/12] qemu: Generate alias and socket path for
	pr-helper
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]);
 Wed, 21 Feb 2018 18:12:22 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

While we're not generating the command line just yet (look for
the next commits), we can generate the alias for pr-manager.
A domain can have up to one managed pr-manager (in which case
socket path is decided by libvirt and pr-helper is spawned by
libvirt too), but up to ndisks of unmanaged ones (one per disk
basically). In case of the former we can generate a simple alias
and be sure it'll not conflict. But in case of the latter to
avoid any conflicts let's generate alias that's based on
something unique - like disk target.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/libvirt_private.syms  |  2 ++
 src/qemu/qemu_domain.c    | 80 +++++++++++++++++++++++++++++++++++++++++++=
++--
 src/qemu/qemu_domain.h    | 10 ++++++
 src/util/virstoragefile.c | 15 +++++++++
 src/util/virstoragefile.h |  2 ++
 5 files changed, 106 insertions(+), 3 deletions(-)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d4bff0f0b..bb0183ea6 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2781,7 +2781,9 @@ virStorageNetHostTransportTypeToString;
 virStorageNetProtocolTypeToString;
 virStoragePRDefFormat;
 virStoragePRDefFree;
+virStoragePRDefIsEnabled;
 virStoragePRDefIsEqual;
+virStoragePRDefIsManaged;
 virStoragePRDefParseNode;
 virStorageSourceBackingStoreClear;
 virStorageSourceClear;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index de8974d66..dffc4c30e 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -982,6 +982,18 @@ qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *seci=
nfo)
 }
=20
=20
+static void
+qemuDomainDiskPRDFree(qemuDomainDiskPRDPtr prd)
+{
+    if (!prd)
+        return;
+
+    VIR_FREE(prd->alias);
+    VIR_FREE(prd->path);
+    VIR_FREE(prd);
+}
+
+
 static virClassPtr qemuDomainDiskPrivateClass;
 static void qemuDomainDiskPrivateDispose(void *obj);
=20
@@ -1062,6 +1074,7 @@ qemuDomainStorageSourcePrivateDispose(void *obj)
=20
     qemuDomainSecretInfoFree(&priv->secinfo);
     qemuDomainSecretInfoFree(&priv->encinfo);
+    qemuDomainDiskPRDFree(priv->prd);
 }
=20
=20
@@ -1473,9 +1486,6 @@ qemuDomainSecretStorageSourcePrepare(qemuDomainObjPri=
vatePtr priv,
     if (!hasAuth && !hasEnc)
         return 0;
=20
-    if (!(src->privateData =3D qemuDomainStorageSourcePrivateNew()))
-        return -1;
-
     srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src);
=20
     if (hasAuth) {
@@ -11538,17 +11548,81 @@ qemuDomainCheckMigrationCapabilities(virQEMUDrive=
rPtr driver,
 }
=20
=20
+static int
+qemuDomainPrepareDiskPRD(qemuDomainObjPrivatePtr priv,
+                         virDomainDiskDefPtr disk)
+{
+    qemuDomainStorageSourcePrivatePtr srcPriv;
+    virStoragePRDefPtr prd =3D disk->src->pr;
+    char *prAlias =3D NULL;
+    char *prPath =3D NULL;
+    int ret =3D -1;
+
+    if (!virStoragePRDefIsEnabled(prd))
+        return 0;
+
+    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("reservations not supported with this QEMU binary=
"));
+        goto cleanup;
+    }
+
+    if (!virStorageSourceIsLocalStorage(disk->src)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("reservations supported only for local storage"));
+        goto cleanup;
+    }
+
+    srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);
+
+    if (virStoragePRDefIsManaged(prd)) {
+        /* Generate PR helper socket path & alias that are same
+         * for each disk in the domain. */
+
+        if (VIR_STRDUP(prAlias, "pr-helper0") < 0)
+            return -1;
+
+        if (virAsprintf(&prPath, "%s/pr-helper0.sock", priv->libDir) < 0)
+            return -1;
+
+    } else {
+        if (virAsprintf(&prAlias, "pr-helper-%s", disk->dst) < 0)
+            return -1;
+
+        if (VIR_STRDUP(prPath, prd->path) < 0)
+            return -1;
+    }
+
+    if (VIR_ALLOC(srcPriv->prd) < 0)
+        goto cleanup;
+    VIR_STEAL_PTR(srcPriv->prd->alias, prAlias);
+    VIR_STEAL_PTR(srcPriv->prd->path, prPath);
+
+    ret =3D 0;
+ cleanup:
+    VIR_FREE(prPath);
+    VIR_FREE(prAlias);
+    return ret;
+}
+
+
 int
 qemuDomainPrepareDiskSource(virDomainDiskDefPtr disk,
                             qemuDomainObjPrivatePtr priv,
                             virQEMUDriverConfigPtr cfg)
 {
+    if (!(disk->src->privateData =3D qemuDomainStorageSourcePrivateNew()))
+        return -1;
+
     if (qemuDomainPrepareDiskSourceTLS(disk->src, cfg) < 0)
         return -1;
=20
     if (qemuDomainSecretDiskPrepare(priv, disk) < 0)
         return -1;
=20
+    if (qemuDomainPrepareDiskPRD(priv, disk) < 0)
+        return -1;
+
     if (disk->src->type =3D=3D VIR_STORAGE_TYPE_NETWORK &&
         disk->src->protocol =3D=3D VIR_STORAGE_NET_PROTOCOL_GLUSTER &&
         virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_GLUSTER_DEBUG_LEVEL)) {
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 6d3e6eb5e..b9258eb8e 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -373,6 +373,13 @@ struct _qemuDomainDiskPrivate {
     bool removable; /* device media can be removed/changed */
 };
=20
+typedef struct _qemuDomainDiskPRD qemuDomainDiskPRD;
+typedef qemuDomainDiskPRD *qemuDomainDiskPRDPtr;
+struct _qemuDomainDiskPRD {
+    char *alias;
+    char *path; /* socket path. */
+};
+
 # define QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(src) \
     ((qemuDomainStorageSourcePrivatePtr) (src)->privateData)
=20
@@ -386,6 +393,9 @@ struct _qemuDomainStorageSourcePrivate {
=20
     /* data required for decryption of encrypted storage source */
     qemuDomainSecretInfoPtr encinfo;
+
+    /* data required for persistent reservations */
+    qemuDomainDiskPRDPtr prd;
 };
=20
 virObjectPtr qemuDomainStorageSourcePrivateNew(void);
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 328f59788..a85fec330 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2076,6 +2076,21 @@ virStoragePRDefIsEqual(virStoragePRDefPtr a,
     return true;
 }
=20
+
+bool
+virStoragePRDefIsEnabled(virStoragePRDefPtr prd)
+{
+    return prd && prd->enabled =3D=3D VIR_TRISTATE_BOOL_YES;
+}
+
+
+bool
+virStoragePRDefIsManaged(virStoragePRDefPtr prd)
+{
+    return prd && prd->managed =3D=3D VIR_TRISTATE_BOOL_YES;
+}
+
+
 virSecurityDeviceLabelDefPtr
 virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src,
                                     const char *model)
diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
index e70c99076..cf931bbb1 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -385,6 +385,8 @@ void virStoragePRDefFormat(virBufferPtr buf,
                            virStoragePRDefPtr prd);
 bool virStoragePRDefIsEqual(virStoragePRDefPtr a,
                             virStoragePRDefPtr b);
+bool virStoragePRDefIsEnabled(virStoragePRDefPtr prd);
+bool virStoragePRDefIsManaged(virStoragePRDefPtr prd);
=20
 virSecurityDeviceLabelDefPtr
 virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src,
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236735692193.43422879843695;
 Wed, 21 Feb 2018 10:12:15 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 2EED72C283B;
	Wed, 21 Feb 2018 18:12:14 +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 06BBE6018D;
	Wed, 21 Feb 2018 18:12:14 +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 BE7614A471;
	Wed, 21 Feb 2018 18:12:13 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBmND026240 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:48 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 14C6010A971D; Wed, 21 Feb 2018 18:11:48 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 932A910A971B;
	Wed, 21 Feb 2018 18:11:47 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:30 +0100
Message-Id: 
 <9666a5d37a48e0c87aa1bb102fa54171cb74e608.1519235042.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 05/12] qemu: Store pr runtime data in status XML
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Wed, 21 Feb 2018 18:12:14 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Now that we generate pr-manager alias and socket path store them
in status XML so that they are preserved across daemon restarts.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_domain.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++=
++--
 1 file changed, 88 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index dffc4c30e..45205fd03 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2540,6 +2540,92 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
 }
=20
=20
+static int
+qemuStorageSourcePrivateDataParsePR(xmlXPathContextPtr ctxt,
+                                    virStorageSourcePtr src)
+{
+    qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR=
CE_PRIVATE(src);
+    qemuDomainDiskPRDPtr prd =3D NULL;
+    int rc;
+    int ret =3D -1;
+
+    if ((rc =3D virXPathBoolean("boolean(./prd)", ctxt)) =3D=3D  0) {
+        return 0;
+    } else if (rc < 0) {
+        return ret;
+    }
+
+    if (VIR_ALLOC(prd) < 0)
+        goto cleanup;
+
+    if (!(prd->alias =3D virXPathString("string(./prd/alias)", ctxt)) ||
+        !(prd->path =3D virXPathString("string(./prd/path)", ctxt))) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("malformed <prd/>"));
+        goto cleanup;
+    }
+
+    VIR_STEAL_PTR(srcPriv->prd, prd);
+    ret =3D 0;
+ cleanup:
+    qemuDomainDiskPRDFree(prd);
+    return ret;
+}
+
+
+static int
+qemuStorageSourcePrivateDataFormatPR(virStorageSourcePtr src,
+                                     virBufferPtr buf)
+{
+    qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR=
CE_PRIVATE(src);
+    qemuDomainDiskPRDPtr prd;
+
+    if (!srcPriv || !srcPriv->prd)
+        return 0;
+
+    prd =3D srcPriv->prd;
+
+    virBufferAddLit(buf, "<prd>\n");
+    virBufferAdjustIndent(buf, 2);
+    virBufferAsprintf(buf, "<alias>%s</alias>\n", prd->alias);
+    virBufferAsprintf(buf, "<path>%s</path>\n", prd->path);
+    virBufferAdjustIndent(buf, -2);
+    virBufferAddLit(buf, "</prd>\n");
+    return 0;
+}
+
+
+static int
+qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
+                                  virStorageSourcePtr src)
+{
+    if (!(src->privateData =3D qemuDomainStorageSourcePrivateNew()))
+        return -1;
+
+    if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0)
+        return -1;
+
+    if (qemuStorageSourcePrivateDataParsePR(ctxt, src) < 0)
+        return -1;
+
+    return 0;
+}
+
+
+static int
+qemuStorageSourcePrivateDataFormat(virStorageSourcePtr src,
+                                   virBufferPtr buf)
+{
+    if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0)
+        return -1;
+
+    if (qemuStorageSourcePrivateDataFormatPR(src, buf) < 0)
+        return -1;
+
+    return 0;
+}
+
+
 virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks =3D {
     .alloc =3D qemuDomainObjPrivateAlloc,
     .free =3D qemuDomainObjPrivateFree,
@@ -2548,8 +2634,8 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivate=
DataCallbacks =3D {
     .chrSourceNew =3D qemuDomainChrSourcePrivateNew,
     .parse =3D qemuDomainObjPrivateXMLParse,
     .format =3D qemuDomainObjPrivateXMLFormat,
-    .storageParse =3D virStorageSourcePrivateDataParseRelPath,
-    .storageFormat =3D virStorageSourcePrivateDataFormatRelPath,
+    .storageParse =3D qemuStorageSourcePrivateDataParse,
+    .storageFormat =3D qemuStorageSourcePrivateDataFormat,
 };
=20
=20
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236740207124.06341572135887;
 Wed, 21 Feb 2018 10:12:20 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 6DA2BC4115;
	Wed, 21 Feb 2018 18:12:18 +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 3D1D260275;
	Wed, 21 Feb 2018 18:12:17 +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 DD81F18033F1;
	Wed, 21 Feb 2018 18:12:16 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBnIZ026252 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:49 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id C2E9F10A971E; Wed, 21 Feb 2018 18:11:48 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 4D7B310A971B;
	Wed, 21 Feb 2018 18:11:48 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:31 +0100
Message-Id: 
 <aaa6d0a112864e7d2afeeb7457aeb249a3fd2e26.1519235042.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 06/12] qemu: Generate cmd line at startup
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
 Wed, 21 Feb 2018 18:12:19 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

This is the easier part. All we need to do here is put -object
pr-manger-helper,id=3D$alias,path=3D$socketPath and then just
reference the object in -drive file.pr-manger=3D$alias.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_command.c                            | 40 ++++++++++++++++++=
++++
 .../disk-virtio-scsi-reservations-not-managed.args | 28 +++++++++++++++
 .../disk-virtio-scsi-reservations.args             | 29 ++++++++++++++++
 tests/qemuxml2argvtest.c                           |  8 +++++
 4 files changed, 105 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations-no=
t-managed.args
 create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.ar=
gs

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index fa0aa5d5c..069d60d35 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1514,6 +1514,20 @@ qemuDiskSourceGetProps(virStorageSourcePtr src)
 }
=20
=20
+static void
+qemuBuildDriveSourcePR(virBufferPtr buf,
+                       virStorageSourcePtr src)
+{
+    qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_SOUR=
CE_PRIVATE(src);
+    qemuDomainDiskPRDPtr prd =3D srcPriv->prd;
+
+    if (!prd || !prd->alias)
+        return;
+
+    virBufferAsprintf(buf, ",file.pr-manager=3D%s", prd->alias);
+}
+
+
 static int
 qemuBuildDriveSourceStr(virDomainDiskDefPtr disk,
                         virQEMUCapsPtr qemuCaps,
@@ -1590,6 +1604,8 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk,
=20
         if (disk->src->debug)
             virBufferAsprintf(buf, ",file.debug=3D%d", disk->src->debugLev=
el);
+
+        qemuBuildDriveSourcePR(buf, disk->src);
     } else {
         if (!(source =3D virQEMUBuildDriveCommandlineFromJSON(srcprops)))
             goto cleanup;
@@ -9789,6 +9805,28 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
 }
=20
=20
+static void
+qemuBuildMasterPRCommandLine(virCommandPtr cmd,
+                             const virDomainDef *def)
+{
+    size_t i;
+
+    for (i =3D 0; i < def->ndisks; i++) {
+        const virDomainDiskDef *disk =3D def->disks[i];
+        qemuDomainStorageSourcePrivatePtr srcPriv =3D QEMU_DOMAIN_STORAGE_=
SOURCE_PRIVATE(disk->src);
+        qemuDomainDiskPRDPtr prd =3D srcPriv->prd;
+        virBuffer buf =3D VIR_BUFFER_INITIALIZER;
+
+        if (!prd || !prd->alias)
+            continue;
+
+        virBufferAsprintf(&buf, "pr-manager-helper,id=3D%s,path=3D%s", prd=
->alias, prd->path);
+        virCommandAddArg(cmd, "-object");
+        virCommandAddArgBuffer(cmd, &buf);
+    }
+}
+
+
 /**
  * qemuBuildCommandLineValidate:
  *
@@ -9941,6 +9979,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
     if (qemuBuildMasterKeyCommandLine(cmd, priv) < 0)
         goto error;
=20
+    qemuBuildMasterPRCommandLine(cmd, def);
+
     if (enableFips)
         virCommandAddArg(cmd, "-enable-fips");
=20
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-manag=
ed.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.=
args
new file mode 100644
index 000000000..387432c18
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations-not-managed.args
@@ -0,0 +1,28 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-i686 \
+-name QEMUGuest1 \
+-S \
+-object pr-manager-helper,id=3Dpr-helper-sdb,path=3D/path/to/qemu-pr-helpe=
r.sock \
+-M pc \
+-m 214 \
+-smp 8,sockets=3D8,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-nographic \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-no-acpi \
+-boot c \
+-device virtio-scsi-pci,id=3Dscsi0,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \
+-usb \
+-drive file=3D/dev/HostVG/QEMUGuest1,file.pr-manager=3Dpr-helper-sdb,forma=
t=3Draw,\
+if=3Dnone,id=3Ddrive-scsi0-0-0-0,boot=3Don \
+-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\
+drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args b/te=
sts/qemuxml2argvdata/disk-virtio-scsi-reservations.args
new file mode 100644
index 000000000..2dc53cf05
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args
@@ -0,0 +1,29 @@
+LC_ALL=3DC \
+PATH=3D/bin \
+HOME=3D/home/test \
+USER=3Dtest \
+LOGNAME=3Dtest \
+QEMU_AUDIO_DRV=3Dnone \
+/usr/bin/qemu-system-i686 \
+-name QEMUGuest1 \
+-S \
+-object pr-manager-helper,id=3Dpr-helper0,\
+path=3D/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \
+-M pc \
+-m 214 \
+-smp 8,sockets=3D8,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-nographic \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dreadline \
+-no-acpi \
+-boot c \
+-device virtio-scsi-pci,id=3Dscsi0,num_queues=3D8,bus=3Dpci.0,addr=3D0x3 \
+-usb \
+-drive file=3D/dev/HostVG/QEMUGuest1,file.pr-manager=3Dpr-helper0,format=
=3Draw,\
+if=3Dnone,id=3Ddrive-scsi0-0-0-0,boot=3Don \
+-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D0,\
+drive=3Ddrive-scsi0-0-0-0,id=3Dscsi0-0-0-0 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 688846b9b..429cdf079 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2966,6 +2966,14 @@ mymain(void)
             QEMU_CAPS_HDA_DUPLEX);
     DO_TEST("user-aliases2", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI=
);
=20
+    DO_TEST("disk-virtio-scsi-reservations",
+            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_PR_MANAGER_HELPER);
+
+    DO_TEST("disk-virtio-scsi-reservations-not-managed",
+            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_PR_MANAGER_HELPER);
+
     if (getenv("LIBVIRT_SKIP_CLEANUP") =3D=3D NULL)
         virFileDeleteTree(fakerootdir);
=20
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236747422926.5619854563953;
 Wed, 21 Feb 2018 10:12:27 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 283C52FB8F7;
	Wed, 21 Feb 2018 18:12:26 +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 B08F860C94;
	Wed, 21 Feb 2018 18:12:24 +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 7AC034A47C;
	Wed, 21 Feb 2018 18:12:24 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBn4c026263 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:49 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 7C4AD10A971D; Wed, 21 Feb 2018 18:11:49 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 074DD10A971B;
	Wed, 21 Feb 2018 18:11:48 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:32 +0100
Message-Id: 
 <6db780a69e8c24866099f2d25cb4b9aab3a76032.1519235042.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 07/12] qemu: Introduce pr_helper to qemu.conf
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]);
 Wed, 21 Feb 2018 18:12:26 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Just like we allow users overriding path to bridge-helper
detected at compile time we can allow them to override path to
qemu-pr-helper.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 m4/virt-driver-qemu.m4             | 5 +++++
 src/qemu/libvirtd_qemu.aug         | 1 +
 src/qemu/qemu.conf                 | 4 ++++
 src/qemu/qemu_conf.c               | 7 ++++++-
 src/qemu/qemu_conf.h               | 1 +
 src/qemu/test_libvirtd_qemu.aug.in | 1 +
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/m4/virt-driver-qemu.m4 b/m4/virt-driver-qemu.m4
index b9bafdab9..0e0f261d6 100644
--- a/m4/virt-driver-qemu.m4
+++ b/m4/virt-driver-qemu.m4
@@ -57,6 +57,11 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_QEMU], [
                [/usr/libexec:/usr/lib/qemu:/usr/lib])
   AC_DEFINE_UNQUOTED([QEMU_BRIDGE_HELPER], ["$QEMU_BRIDGE_HELPER"],
                      [QEMU bridge helper])
+  AC_PATH_PROG([QEMU_PR_HELPER], [qemu-pr-helper],
+               [/usr/libexec/qemu-pr-helper],
+               [/usr/libexec:/usr/lib/qemu:/usr/lib])
+  AC_DEFINE_UNQUOTED([QEMU_PR_HELPER], ["$QEMU_PR_HELPER"],
+                     [QEMU PR helper])
 ])
=20
 AC_DEFUN([LIBVIRT_DRIVER_RESULT_QEMU], [
diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug
index c19bf3a43..2dc16e91f 100644
--- a/src/qemu/libvirtd_qemu.aug
+++ b/src/qemu/libvirtd_qemu.aug
@@ -86,6 +86,7 @@ module Libvirtd_qemu =3D
    let process_entry =3D str_entry "hugetlbfs_mount"
                  | bool_entry "clear_emulator_capabilities"
                  | str_entry "bridge_helper"
+                 | str_entry "pr_helper"
                  | bool_entry "set_process_name"
                  | int_entry "max_processes"
                  | int_entry "max_files"
diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
index 43dd561cc..4bc668406 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -775,3 +775,7 @@
 # This directory is used for memoryBacking source if configured as file.
 # NOTE: big files will be stored here
 #memory_backing_dir =3D "/var/lib/libvirt/qemu/ram"
+
+# Path to the SCSI persistent reservations helper. This helper is
+# used whenever <reservations/> are enabled for SCSI disks.
+#pr_helper =3D "/usr/libexec/qemu-pr-helper"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 36cf3a281..8c69dbe75 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -307,7 +307,8 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool priv=
ileged)
             goto error;
     }
=20
-    if (VIR_STRDUP(cfg->bridgeHelperName, QEMU_BRIDGE_HELPER) < 0)
+    if (VIR_STRDUP(cfg->bridgeHelperName, QEMU_BRIDGE_HELPER) < 0 ||
+        VIR_STRDUP(cfg->prHelperName, QEMU_PR_HELPER) < 0)
         goto error;
=20
     cfg->clearEmulatorCapabilities =3D true;
@@ -392,6 +393,7 @@ static void virQEMUDriverConfigDispose(void *obj)
     }
     VIR_FREE(cfg->hugetlbfs);
     VIR_FREE(cfg->bridgeHelperName);
+    VIR_FREE(cfg->prHelperName);
=20
     VIR_FREE(cfg->saveImageFormat);
     VIR_FREE(cfg->dumpImageFormat);
@@ -759,6 +761,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr =
cfg,
     if (virConfGetValueString(conf, "bridge_helper", &cfg->bridgeHelperNam=
e) < 0)
         goto cleanup;
=20
+    if (virConfGetValueString(conf, "pr_helper", &cfg->prHelperName) < 0)
+        goto cleanup;
+
     if (virConfGetValueBool(conf, "mac_filter", &cfg->macFilter) < 0)
         goto cleanup;
=20
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 83fd45282..5baa3af5d 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -153,6 +153,7 @@ struct _virQEMUDriverConfig {
     size_t nhugetlbfs;
=20
     char *bridgeHelperName;
+    char *prHelperName;
=20
     bool macFilter;
=20
diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qe=
mu.aug.in
index 688e5b9fd..c0efae47b 100644
--- a/src/qemu/test_libvirtd_qemu.aug.in
+++ b/src/qemu/test_libvirtd_qemu.aug.in
@@ -100,3 +100,4 @@ module Test_libvirtd_qemu =3D
     { "1" =3D "mount" }
 }
 { "memory_backing_dir" =3D "/var/lib/libvirt/qemu/ram" }
+{ "pr_helper" =3D "/usr/libexec/qemu-pr-helper" }
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236751043234.80891794038052;
 Wed, 21 Feb 2018 10:12:31 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com
 [10.5.11.12])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 10B762C2848;
	Wed, 21 Feb 2018 18:12:29 +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 7B5A960CA3;
	Wed, 21 Feb 2018 18:12:27 +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 3878F18033F5;
	Wed, 21 Feb 2018 18:12:27 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBobf026273 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:50 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 35BF910A971D; Wed, 21 Feb 2018 18:11:50 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B4D5710A971B;
	Wed, 21 Feb 2018 18:11:49 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:33 +0100
Message-Id: 
 <1265a40745795d7931792df4704c7a22e0e3b6ec.1519235042.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 08/12] qemu_domain: Track pr-helper PID in
	status XML
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Wed, 21 Feb 2018 18:12:29 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_domain.c | 16 ++++++++++++++++
 src/qemu/qemu_domain.h |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 45205fd03..f7da62dba 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1864,6 +1864,7 @@ qemuDomainObjPrivateAlloc(void *opaque)
=20
     priv->migMaxBandwidth =3D QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
     priv->driver =3D opaque;
+    priv->prPid =3D (pid_t) -1;
=20
     return priv;
=20
@@ -1926,6 +1927,8 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivatePtr=
 priv)
=20
     virBitmapFree(priv->migrationCaps);
     priv->migrationCaps =3D NULL;
+
+    priv->prPid =3D (pid_t) -1;
 }
=20
=20
@@ -2172,6 +2175,11 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf,
     if (qemuDomainObjPrivateXMLFormatBlockjobs(buf, vm) < 0)
         return -1;
=20
+    if (priv->prPid !=3D (pid_t) -1) {
+        virBufferAsprintf(buf, "<prPid>%lld</prPid>\n",
+                          (long long) priv->prPid);
+    }
+
     return 0;
 }
=20
@@ -2318,6 +2326,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
     xmlNodePtr *nodes =3D NULL;
     xmlNodePtr node =3D NULL;
     virQEMUCapsPtr qemuCaps =3D NULL;
+    long long prPid =3D -1;
=20
     if (VIR_ALLOC(priv->monConfig) < 0)
         goto error;
@@ -2524,6 +2533,13 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
     if (qemuDomainObjPrivateXMLParseBlockjobs(priv, ctxt) < 0)
         goto error;
=20
+    if (virXPathLongLong("string(./prPid)", ctxt, &prPid) < -1) {
+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+                       _("unable to parse <prPid/>"));
+        goto error;
+    }
+    priv->prPid =3D (pid_t) prPid;
+
     return 0;
=20
  error:
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index b9258eb8e..418b47153 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -342,6 +342,8 @@ struct _qemuDomainObjPrivate {
     /* Migration capabilities. Rechecked on reconnect, not to be saved in
      * private XML. */
     virBitmapPtr migrationCaps;
+
+    pid_t prPid;
 };
=20
 # define QEMU_DOMAIN_PRIVATE(vm) \
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236739792108.82015138360669;
 Wed, 21 Feb 2018 10:12:19 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id E3CE12C284D;
	Wed, 21 Feb 2018 18:12:17 +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 BCF0D6049B;
	Wed, 21 Feb 2018 18:12:17 +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 7078318033F3;
	Wed, 21 Feb 2018 18:12:17 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBpKH026282 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:51 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id E2D9510A971D; Wed, 21 Feb 2018 18:11:50 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6E36D10A971B;
	Wed, 21 Feb 2018 18:11:50 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:34 +0100
Message-Id: 
 <2b2ee1ec737d7c514192fe1048be883bc26536e7.1519235042.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 09/12] qemu: Start PR daemons on domain startup
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]);
 Wed, 21 Feb 2018 18:12:18 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Before we exec() qemu we have to spawn pr-helper processes for
all managed reservations (well, technically there can only one).
The only caveat there is that we should place the process into
the same namespace and cgroup as qemu (so that it shares the same
view of the system). But we can do that only after we've forked.
That means calling the setup function between fork() and exec().

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_process.c | 164 ++++++++++++++++++++++++++++++++++++++++++++=
++++
 1 file changed, 164 insertions(+)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index dc33eb7bc..33e0ad30c 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2551,6 +2551,164 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
     ret =3D 0;
  cleanup:
     virObjectUnref(caps);
+
+    return ret;
+}
+
+
+static void
+qemuProcessKillPRDaemons(virDomainObjPtr vm)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+
+    if (priv->prPid =3D=3D (pid_t) -1)
+        return;
+
+    virProcessKillPainfully(priv->prPid, true);
+    priv->prPid =3D (pid_t) -1;
+}
+
+
+static int
+qemuProcessSetupOnePRDaemonHook(void *opaque)
+{
+    virDomainObjPtr vm =3D opaque;
+    size_t i, nfds =3D 0;
+    int *fds =3D NULL;
+    int ret =3D -1;
+
+    if (virProcessGetNamespaces(vm->pid, &nfds, &fds) < 0)
+        return ret;
+
+    if (nfds > 0 &&
+        virProcessSetNamespaces(nfds, fds) < 0)
+        goto cleanup;
+
+    ret =3D 0;
+ cleanup:
+    for (i =3D 0; i < nfds; i++)
+        VIR_FORCE_CLOSE(fds[i]);
+    VIR_FREE(fds);
+    return ret;
+}
+
+
+static int
+qemuProcessSetupOnePRDaemon(virDomainObjPtr vm,
+                            virDomainDiskDefPtr disk)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+    virQEMUDriverPtr driver =3D priv->driver;
+    virQEMUDriverConfigPtr cfg;
+    qemuDomainStorageSourcePrivatePtr srcPriv;
+    qemuDomainDiskPRDPtr prd;
+    char *pidfile =3D NULL;
+    pid_t cpid =3D -1;
+    virCommandPtr cmd =3D NULL;
+    virTimeBackOffVar timebackoff;
+    const unsigned long long timeout =3D 500000; /* ms */
+    int ret =3D -1;
+
+    if (priv->prPid !=3D (pid_t) -1 ||
+        !virStoragePRDefIsManaged(disk->src->pr))
+        return 0;
+
+    cfg =3D virQEMUDriverGetConfig(driver);
+    srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);
+    prd =3D srcPriv->prd;
+
+    if (!virFileIsExecutable(cfg->prHelperName)) {
+        virReportSystemError(errno, _("'%s' is not a suitable pr helper"),
+                             cfg->prHelperName);
+        goto cleanup;
+    }
+
+    if (!(pidfile =3D virPidFileBuildPath(cfg->stateDir, prd->alias)))
+        goto cleanup;
+
+    if (unlink(pidfile) < 0 &&
+        errno !=3D ENOENT) {
+        virReportSystemError(errno,
+                             _("Cannot remove stale PID file %s"),
+                             pidfile);
+        goto cleanup;
+    }
+
+    if (!(cmd =3D virCommandNewArgList(cfg->prHelperName,
+                                     "-k", prd->path,
+                                     NULL)))
+        goto cleanup;
+
+    virCommandDaemonize(cmd);
+    virCommandSetPidFile(cmd, pidfile);
+    virCommandSetPreExecHook(cmd, qemuProcessSetupOnePRDaemonHook, vm);
+
+    if (virCommandRun(cmd, NULL) < 0)
+        goto cleanup;
+
+    if (virPidFileReadPath(pidfile, &cpid) < 0) {
+        virReportError(VIR_ERR_INTERNAL_ERROR,
+                       _("pr helper %s didn't show up"), prd->alias);
+        goto cleanup;
+    }
+
+    if (virTimeBackOffStart(&timebackoff, 1, timeout) < 0)
+        goto cleanup;
+    while (virTimeBackOffWait(&timebackoff)) {
+        if (virFileExists(prd->path))
+            break;
+
+        if (virProcessKill(cpid, 0) =3D=3D 0)
+            continue;
+
+        virReportSystemError(errno,
+                             _("pr helper %s died unexpectedly"), prd->ali=
as);
+        goto cleanup;
+    }
+
+    if (priv->cgroup &&
+        virCgroupAddMachineTask(priv->cgroup, cpid) < 0)
+        goto cleanup;
+
+    if (qemuSecurityDomainSetPathLabel(driver->securityManager,
+                                       vm->def, prd->path, true) < 0)
+        goto cleanup;
+
+    priv->prPid =3D cpid;
+    ret =3D 0;
+ cleanup:
+    if (ret < 0) {
+        virCommandAbort(cmd);
+        virProcessKillPainfully(cpid, true);
+    }
+    virCommandFree(cmd);
+    if (unlink(pidfile) < 0 &&
+        errno !=3D ENOENT &&
+        !virGetLastError())
+        virReportSystemError(errno,
+                             _("Cannot remove stale PID file %s"),
+                             pidfile);
+    VIR_FREE(pidfile);
+    virObjectUnref(cfg);
+    return ret;
+}
+
+
+static int
+qemuProcessSetupPRDaemons(virDomainObjPtr vm)
+{
+    size_t i;
+    int ret =3D -1;
+
+    for (i =3D 0; i < vm->def->ndisks; i++) {
+        if (qemuProcessSetupOnePRDaemon(vm, vm->def->disks[i]) < 0)
+            goto cleanup;
+    }
+
+    ret =3D 0;
+ cleanup:
+    if (ret < 0)
+        qemuProcessKillPRDaemons(vm);
     return ret;
 }
=20
@@ -6074,6 +6232,10 @@ qemuProcessLaunch(virConnectPtr conn,
     if (qemuProcessResctrlCreate(driver, vm) < 0)
         goto cleanup;
=20
+    VIR_DEBUG("Setting up PR daemons");
+    if (qemuProcessSetupPRDaemons(vm) < 0)
+        goto cleanup;
+
     VIR_DEBUG("Setting domain security labels");
     if (qemuSecuritySetAllLabel(driver,
                                 vm,
@@ -6654,6 +6816,8 @@ void qemuProcessStop(virQEMUDriverPtr driver,
         VIR_FREE(vm->def->seclabels[i]->imagelabel);
     }
=20
+    qemuProcessKillPRDaemons(vm);
+
     qemuHostdevReAttachDomainDevices(driver, vm->def);
=20
     def =3D vm->def;
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236752145855.0697195200041;
 Wed, 21 Feb 2018 10:12:32 -0800 (PST)
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 mx1.redhat.com (Postfix) with ESMTPS id B8D27723B0;
	Wed, 21 Feb 2018 18:12:30 +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 80B045D967;
	Wed, 21 Feb 2018 18:12: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 4C7B34A47E;
	Wed, 21 Feb 2018 18:12:30 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBpLi026289 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:51 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 9C50410A971C; Wed, 21 Feb 2018 18:11:51 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 277AD10A971B;
	Wed, 21 Feb 2018 18:11:51 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:35 +0100
Message-Id: 
 <88706256b3a548e75809d57a3e3e74d97f33588c.1519235042.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 10/12] qemu_hotplug: Hotplug of reservations
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Wed, 21 Feb 2018 18:12:31 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Surprisingly, nothing special is happening here. If we are the
first to use the managed helper then spawn it. If not, we're
almost done.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_hotplug.c | 72 +++++++++++++++++++++++++++++++++++++++++++++=
++++
 src/qemu/qemu_process.c | 38 +++++++++++++++++++++-----
 src/qemu/qemu_process.h |  7 +++++
 3 files changed, 110 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index f28006e3c..2ebb68fbc 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -348,6 +348,58 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
 }
=20
=20
+static int
+qemuBuildPRDefInfoProps(virDomainObjPtr vm,
+                        virDomainDiskDefPtr disk,
+                        virJSONValuePtr *prmgrProps,
+                        const char **prAlias,
+                        const char **prPath)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+    qemuDomainStorageSourcePrivatePtr srcPriv;
+    virJSONValuePtr props =3D NULL;
+    int ret =3D -1;
+
+    srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);
+
+    *prmgrProps =3D NULL;
+
+    if (priv->prPid !=3D (pid_t) -1 ||
+        !srcPriv->prd ||
+        !srcPriv->prd->alias)
+        return 0;
+
+    if (virJSONValueObjectCreate(&props,
+                                 "s:path", srcPriv->prd->path,
+                                 NULL) < 0)
+        goto cleanup;
+
+    if (qemuProcessSetupOnePRDaemon(vm, disk) < 0)
+        goto cleanup;
+
+    *prAlias =3D srcPriv->prd->alias;
+    *prPath =3D srcPriv->prd->path;
+    *prmgrProps =3D props;
+    props =3D NULL;
+    ret =3D 0;
+ cleanup:
+    virJSONValueFree(props);
+    return ret;
+}
+
+
+static void
+qemuDestroyPRDefObject(virDomainObjPtr vm,
+                       const char *alias,
+                       const char *path)
+{
+    if (!alias)
+        return;
+
+    qemuProcessKillPRDaemons(vm, path, false);
+}
+
+
 /**
  * qemuDomainAttachDiskGeneric:
  *
@@ -365,12 +417,16 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
     char *devstr =3D NULL;
     char *drivestr =3D NULL;
     char *drivealias =3D NULL;
+    const char *prAlias =3D NULL;
+    const char *prPath =3D NULL;
     bool driveAdded =3D false;
     bool secobjAdded =3D false;
     bool encobjAdded =3D false;
+    bool prmgrAdded =3D false;
     virQEMUDriverConfigPtr cfg =3D virQEMUDriverGetConfig(driver);
     virJSONValuePtr secobjProps =3D NULL;
     virJSONValuePtr encobjProps =3D NULL;
+    virJSONValuePtr prmgrProps =3D NULL;
     qemuDomainStorageSourcePrivatePtr srcPriv;
     qemuDomainSecretInfoPtr secinfo =3D NULL;
     qemuDomainSecretInfoPtr encinfo =3D NULL;
@@ -403,6 +459,9 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
                                       disk->info.alias) < 0)
         goto error;
=20
+    if (qemuBuildPRDefInfoProps(vm, disk, &prmgrProps, &prAlias, &prPath) =
< 0)
+        goto error;
+
     if (!(drivestr =3D qemuBuildDriveStr(disk, false, priv->qemuCaps)))
         goto error;
=20
@@ -435,6 +494,15 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
         encobjAdded =3D true;
     }
=20
+    if (prmgrProps) {
+        rv =3D qemuMonitorAddObject(priv->mon, "pr-manager-helper", prAlia=
s,
+                                  prmgrProps);
+        prmgrProps =3D NULL; /* qemuMonitorAddObject consumes */
+        if (rv < 0)
+            goto exit_monitor;
+        prmgrAdded =3D true;
+    }
+
     if (qemuMonitorAddDrive(priv->mon, drivestr) < 0)
         goto exit_monitor;
     driveAdded =3D true;
@@ -455,6 +523,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
  cleanup:
     virJSONValueFree(secobjProps);
     virJSONValueFree(encobjProps);
+    virJSONValueFree(prmgrProps);
     qemuDomainSecretDiskDestroy(disk);
     VIR_FREE(devstr);
     VIR_FREE(drivestr);
@@ -472,6 +541,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
         ignore_value(qemuMonitorDelObject(priv->mon, secinfo->s.aes.alias)=
);
     if (encobjAdded)
         ignore_value(qemuMonitorDelObject(priv->mon, encinfo->s.aes.alias)=
);
+    if (prmgrAdded)
+        ignore_value(qemuMonitorDelObject(priv->mon, prAlias));
     if (qemuDomainObjExitMonitor(driver, vm) < 0)
         ret =3D -2;
     virErrorRestore(&orig_err);
@@ -481,6 +552,7 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
  error:
     qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src);
     ignore_value(qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, true=
));
+    qemuDestroyPRDefObject(vm, prAlias, prPath);
     goto cleanup;
 }
=20
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 33e0ad30c..3a914b6c6 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2556,16 +2556,40 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
 }
=20
=20
-static void
-qemuProcessKillPRDaemons(virDomainObjPtr vm)
+void
+qemuProcessKillPRDaemons(virDomainObjPtr vm,
+                         const char *socketPath,
+                         bool force)
 {
     qemuDomainObjPrivatePtr priv =3D vm->privateData;
+    size_t nmanaged =3D 0;
+    size_t i;
=20
     if (priv->prPid =3D=3D (pid_t) -1)
         return;
=20
-    virProcessKillPainfully(priv->prPid, true);
-    priv->prPid =3D (pid_t) -1;
+    for (i =3D 0; i < vm->def->ndisks; i++) {
+        qemuDomainStorageSourcePrivatePtr srcPriv;
+        virDomainDiskDefPtr disk =3D vm->def->disks[i];
+
+        if (!virStoragePRDefIsManaged(disk->src->pr))
+            continue;
+
+        nmanaged++;
+
+        srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);
+        if (!socketPath)
+            socketPath =3D srcPriv->prd->path;
+    }
+
+    if (force || nmanaged <=3D 1) {
+        virProcessKillPainfully(priv->prPid, true);
+        priv->prPid =3D (pid_t) -1;
+        if (socketPath &&
+            unlink(socketPath) < 0 &&
+            errno !=3D ENOENT)
+            VIR_WARN("Unable to remove pr helper socket %s", socketPath);
+    }
 }
=20
=20
@@ -2593,7 +2617,7 @@ qemuProcessSetupOnePRDaemonHook(void *opaque)
 }
=20
=20
-static int
+int
 qemuProcessSetupOnePRDaemon(virDomainObjPtr vm,
                             virDomainDiskDefPtr disk)
 {
@@ -2708,7 +2732,7 @@ qemuProcessSetupPRDaemons(virDomainObjPtr vm)
     ret =3D 0;
  cleanup:
     if (ret < 0)
-        qemuProcessKillPRDaemons(vm);
+        qemuProcessKillPRDaemons(vm, NULL, true);
     return ret;
 }
=20
@@ -6816,7 +6840,7 @@ void qemuProcessStop(virQEMUDriverPtr driver,
         VIR_FREE(vm->def->seclabels[i]->imagelabel);
     }
=20
-    qemuProcessKillPRDaemons(vm);
+    qemuProcessKillPRDaemons(vm, NULL, true);
=20
     qemuHostdevReAttachDomainDevices(driver, vm->def);
=20
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 274111567..ab09a7f30 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -203,4 +203,11 @@ int qemuProcessRefreshDisks(virQEMUDriverPtr driver,
                             virDomainObjPtr vm,
                             qemuDomainAsyncJob asyncJob);
=20
+int qemuProcessSetupOnePRDaemon(virDomainObjPtr vm,
+                                virDomainDiskDefPtr disk);
+
+void qemuProcessKillPRDaemons(virDomainObjPtr vm,
+                              const char *socketPath,
+                              bool force);
+
 #endif /* __QEMU_PROCESS_H__ */
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236755724757.0167226217216;
 Wed, 21 Feb 2018 10:12:35 -0800 (PST)
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 mx1.redhat.com (Postfix) with ESMTPS id 1C0A1723BF;
	Wed, 21 Feb 2018 18:12:34 +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 AB76D5D969;
	Wed, 21 Feb 2018 18:12:33 +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 769F118033F9;
	Wed, 21 Feb 2018 18:12:33 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBrcK026301 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:53 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 9586F10A971D; Wed, 21 Feb 2018 18:11:53 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1F9AA10A971C;
	Wed, 21 Feb 2018 18:11:51 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:36 +0100
Message-Id: 
 <4972f90aecc69e2ad5c4be96c949f2ff5e4a1f87.1519235042.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 11/12] qemu_hotplug: Hotunplug of reservations
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Wed, 21 Feb 2018 18:12:34 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Just line in previous commit, if we are the last ones that are
using the pr-manager delete it and also kill the pr-helper
process.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_domain.c  | 19 +++++++++++++++++++
 src/qemu/qemu_domain.h  |  3 +++
 src/qemu/qemu_hotplug.c | 22 ++++++++++++++++++++++
 3 files changed, 44 insertions(+)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index f7da62dba..acfa1d88c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11650,6 +11650,25 @@ qemuDomainCheckMigrationCapabilities(virQEMUDriver=
Ptr driver,
 }
=20
=20
+size_t
+qemuDomainGetPRDManagedCount(const virDomainDef *def)
+{
+    size_t i;
+    size_t nmanaged =3D 0;
+
+    for (i =3D 0; i < def->ndisks; i++) {
+        virDomainDiskDefPtr disk =3D def->disks[i];
+
+        if (!virStoragePRDefIsManaged(disk->src->pr))
+            continue;
+
+        nmanaged++;
+    }
+
+    return nmanaged;
+}
+
+
 static int
 qemuDomainPrepareDiskPRD(qemuDomainObjPrivatePtr priv,
                          virDomainDiskDefPtr disk)
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 418b47153..c2f67f379 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -1007,6 +1007,9 @@ qemuDomainCheckMigrationCapabilities(virQEMUDriverPtr=
 driver,
                                      virDomainObjPtr vm,
                                      qemuDomainAsyncJob asyncJob);
=20
+size_t
+qemuDomainGetPRDManagedCount(const virDomainDef *def);
+
 int
 qemuDomainPrepareDiskSource(virDomainDiskDefPtr disk,
                             qemuDomainObjPrivatePtr priv,
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 2ebb68fbc..d8460cdb4 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -400,6 +400,13 @@ qemuDestroyPRDefObject(virDomainObjPtr vm,
 }
=20
=20
+static bool
+qemuDomainDiskNeedRemovePR(virDomainObjPtr vm)
+{
+    return qemuDomainGetPRDManagedCount(vm->def) =3D=3D 1;
+}
+
+
 /**
  * qemuDomainAttachDiskGeneric:
  *
@@ -3812,6 +3819,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
     char *drivestr;
     char *objAlias =3D NULL;
     char *encAlias =3D NULL;
+    const char *prAlias =3D NULL;
+    const char *prPath =3D NULL;
=20
     VIR_DEBUG("Removing disk %s from domain %p %s",
               disk->info.alias, vm, vm->def->name);
@@ -3849,6 +3858,14 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
         }
     }
=20
+    if (qemuDomainDiskNeedRemovePR(vm)) {
+        qemuDomainStorageSourcePrivatePtr srcPriv;
+
+        srcPriv =3D QEMU_DOMAIN_STORAGE_SOURCE_PRIVATE(disk->src);
+        prAlias =3D srcPriv->prd->alias;
+        prPath =3D srcPriv->prd->path;
+    }
+
     qemuDomainObjEnterMonitor(driver, vm);
=20
     qemuMonitorDriveDel(priv->mon, drivestr);
@@ -3864,6 +3881,9 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
         ignore_value(qemuMonitorDelObject(priv->mon, encAlias));
     VIR_FREE(encAlias);
=20
+    if (prAlias)
+        ignore_value(qemuMonitorDelObject(priv->mon, prAlias));
+
     if (disk->src->haveTLS)
         ignore_value(qemuMonitorDelObject(priv->mon, disk->src->tlsAlias));
=20
@@ -3882,6 +3902,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
         }
     }
=20
+    qemuDestroyPRDefObject(vm, prAlias, prPath);
+
     qemuDomainReleaseDeviceAddress(vm, &disk->info, src);
=20
     if (qemuSecurityRestoreDiskLabel(driver, vm, disk) < 0)
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Tue May  7 06:59:57 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1519236758010436.1157303481874;
 Wed, 21 Feb 2018 10:12:38 -0800 (PST)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id C50BBD5BA7;
	Wed, 21 Feb 2018 18:12:36 +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 9B88D620DB;
	Wed, 21 Feb 2018 18:12:36 +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 6651E4A482;
	Wed, 21 Feb 2018 18:12:36 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com
	[10.11.54.3])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w1LIBs00026314 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 21 Feb 2018 13:11:54 -0500
Received: by smtp.corp.redhat.com (Postfix)
	id 4FFCA10A971B; Wed, 21 Feb 2018 18:11:54 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id CED2110A971C;
	Wed, 21 Feb 2018 18:11:53 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Wed, 21 Feb 2018 19:11:37 +0100
Message-Id: 
 <93c9e9b9abc46f5407ba9266181fedc31a7c2ad1.1519235042.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
In-Reply-To: <cover.1519235041.git.mprivozn@redhat.com>
References: <cover.1519235041.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3
X-loop: libvir-list@redhat.com
Cc: pbonzini@redhat.com
Subject: [libvirt] [PATCH v2 12/12] qemu: Detect pr-manager-helper capability
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Wed, 21 Feb 2018 18:12:37 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

The capability tracks if qemu has pr-manager-helper object.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_capabilities.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d0005c71d..21fbecbf6 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1695,6 +1695,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[=
] =3D {
     { "sclplmconsole", QEMU_CAPS_DEVICE_SCLPLMCONSOLE },
     { "isa-serial", QEMU_CAPS_DEVICE_ISA_SERIAL },
     { "pl011", QEMU_CAPS_DEVICE_PL011 },
+    { "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER },
 };
=20
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioBalloon[]=
 =3D {
--=20
2.16.1

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