From nobody Thu May  2 20:23:22 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 1524489320462165.60572683264854;
 Mon, 23 Apr 2018 06:15:20 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
 [10.5.11.16])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 79BE731500AB;
	Mon, 23 Apr 2018 13:15:18 +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 E1A135FC26;
	Mon, 23 Apr 2018 13:15: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 3EC0A62D15;
	Mon, 23 Apr 2018 13:15:12 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDEuCo022057 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:14:56 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 4D60E215CDCC; Mon, 23 Apr 2018 13:14:56 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8BFC5215CDC8;
	Mon, 23 Apr 2018 13:14:55 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:36 +0200
Message-Id: 
 <bf4c0e81b171b69b9d4323162068c9085a122a5f.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 01/11] 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]);
 Mon, 23 Apr 2018 13:15:19 +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>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 docs/formatdomain.html.in                          |  23 +++-
 docs/schemas/domaincommon.rng                      |  34 +-----
 docs/schemas/storagecommon.rng                     |  50 ++++++++
 src/conf/domain_conf.c                             |  38 ++++++
 src/libvirt_private.syms                           |   3 +
 src/util/virstoragefile.c                          | 131 +++++++++++++++++=
++++
 src/util/virstoragefile.h                          |  14 +++
 .../disk-virtio-scsi-reservations.xml              |  49 ++++++++
 .../disk-virtio-scsi-reservations.xml              |   1 +
 tests/qemuxml2xmltest.c                            |   2 +
 10 files changed, 314 insertions(+), 31 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
 create mode 120000 tests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.=
xml

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index ada0df227f..6ed2fd349d 100644
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2565,7 +2565,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;
@@ -2928,6 +2931,24 @@
             <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.3.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 enables persistent reservations fo=
r 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 a helper process. When the PR is unmanaged, then hype=
rvisor
+            acts as a client and path to server socket must be provided in=
 child
+            element <code>source</code>, which currently accepts only the
+            following attributes: <code>type</code> with one value
+            <code>unix</code>, <code>path</code> with path the socket, and
+            finally <code>mode</code> which accepts either <code>server</c=
ode>
+            or <code>client</code> and specifies the role of hypervisor.
+          </dd>
         </dl>
=20
         <p>
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 4cab55f05d..93084887fb 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>
@@ -2434,18 +2437,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
@@ -2494,24 +2485,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 edee1b0845..eed0b33347 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 65b429460a..c454fb1b9b 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5205,6 +5205,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 devices"));
+        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
@@ -8608,6 +8615,31 @@ virDomainDiskSourcePrivateDataParse(xmlNodePtr node,
 }
=20
=20
+static int
+virDomainDiskSourcePRParse(xmlNodePtr node,
+                           xmlXPathContextPtr ctxt,
+                           virStoragePRDefPtr *pr)
+{
+    xmlNodePtr saveNode =3D ctxt->node;
+    int ret =3D -1;
+
+    ctxt->node =3D node;
+
+    if (!(ctxt->node =3D virXPathNode("./reservations", ctxt))) {
+        ret =3D 0;
+        goto cleanup;
+    }
+
+    if (!(*pr =3D virStoragePRDefParseXML(ctxt)))
+        goto cleanup;
+
+    ret =3D 0;
+ cleanup:
+    ctxt->node =3D saveNode;
+    return ret;
+}
+
+
 static int
 virDomainStorageSourceParse(xmlNodePtr node,
                             xmlXPathContextPtr ctxt,
@@ -8654,6 +8686,9 @@ virDomainStorageSourceParse(xmlNodePtr node,
         !(src->encryption =3D virStorageEncryptionParseNode(tmp, ctxt)))
         goto cleanup;
=20
+    if (virDomainDiskSourcePRParse(node, ctxt, &src->pr) < 0)
+        goto cleanup;
+
     if (virSecurityDeviceLabelDefParseXML(&src->seclabels, &src->nseclabel=
s,
                                           ctxt, flags) < 0)
         goto cleanup;
@@ -22928,6 +22963,9 @@ virDomainStorageSourceFormat(virBufferPtr attrBuf,
         virStorageEncryptionFormat(childBuf, src->encryption) < 0)
         return -1;
=20
+    if (src->pr)
+        virStoragePRDefFormat(childBuf, src->pr);
+
     return 0;
 }
=20
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d2728749fb..f81cb5df93 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2797,6 +2797,9 @@ virStorageNetHostDefFree;
 virStorageNetHostTransportTypeFromString;
 virStorageNetHostTransportTypeToString;
 virStorageNetProtocolTypeToString;
+virStoragePRDefFormat;
+virStoragePRDefFree;
+virStoragePRDefParseXML;
 virStorageSourceBackingStoreClear;
 virStorageSourceClear;
 virStorageSourceCopy;
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 531540ac91..42ef24e9d5 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1892,6 +1892,136 @@ virStorageAuthDefFormat(virBufferPtr buf,
 }
=20
=20
+void
+virStoragePRDefFree(virStoragePRDefPtr prd)
+{
+    if (!prd)
+        return;
+
+    VIR_FREE(prd->path);
+    VIR_FREE(prd);
+}
+
+
+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"), enabled);
+        goto cleanup;
+    }
+
+    if (prd->enabled =3D=3D VIR_TRISTATE_BOOL_YES) {
+        if (!(managed =3D virXPathString("string(./@managed)", ctxt))) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("missing @managed attribute for <reservations=
/>"));
+            goto cleanup;
+        }
+
+        if ((prd->managed =3D virTristateBoolTypeFromString(managed)) <=3D=
 0) {
+            virReportError(VIR_ERR_XML_ERROR,
+                           _("invalid value for 'managed': %s"), managed);
+            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 for <reservation=
s/>"));
+                goto cleanup;
+            }
+
+            if (!path) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("missing path for <reservations/>"));
+                goto cleanup;
+            }
+
+            if (!mode) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("missing connection mode for <reservation=
s/>"));
+                goto cleanup;
+            }
+
+            if (STRNEQ(type, "unix")) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("unsupported connection type for <reserva=
tions/>: %s"),
+                               type);
+                goto cleanup;
+            }
+
+            if (STRNEQ(mode, "client")) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("unsupported connection mode for <reserva=
tions/>: %s"),
+                               mode);
+                goto cleanup;
+            }
+
+            VIR_STEAL_PTR(prd->path, path);
+        }
+    }
+
+    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;
+}
+
+
+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)
@@ -2264,6 +2394,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 d129e81978..69e7e20e17 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,11 @@ virStorageAuthDefPtr virStorageAuthDefParse(xmlNodePtr=
 node,
                                             xmlXPathContextPtr ctxt);
 void virStorageAuthDefFormat(virBufferPtr buf, virStorageAuthDefPtr authde=
f);
=20
+void virStoragePRDefFree(virStoragePRDefPtr prd);
+virStoragePRDefPtr virStoragePRDefParseXML(xmlXPathContextPtr ctxt);
+void virStoragePRDefFormat(virBufferPtr buf,
+                           virStoragePRDefPtr prd);
+
 virSecurityDeviceLabelDefPtr
 virStorageSourceGetSecurityLabelDef(virStorageSourcePtr src,
                                     const char *model);
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml b/tes=
ts/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
new file mode 100644
index 0000000000..036c6e3c25
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
@@ -0,0 +1,49 @@
+<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'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest1'>
+        <reservations enabled=3D'yes' managed=3D'yes'/>
+      </source>
+      <target dev=3D'sda' bus=3D'scsi'/>
+      <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
+    </disk>
+    <disk type=3D'block' device=3D'lun'>
+      <driver name=3D'qemu' type=3D'raw'/>
+      <source dev=3D'/dev/HostVG/QEMUGuest2'>
+        <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'1'/>
+    </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.xml b/t=
ests/qemuxml2xmloutdata/disk-virtio-scsi-reservations.xml
new file mode 120000
index 0000000000..dde52fd1db
--- /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 9e77b9fb13..871f01edd7 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -387,6 +387,8 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-num_queues",
             QEMU_CAPS_VIRTIO_SCSI);
+    DO_TEST("disk-virtio-scsi-reservations",
+            QEMU_CAPS_VIRTIO_SCSI);
     DO_TEST("disk-virtio-scsi-cmd_per_lun",
             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 Thu May  2 20:23:22 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 1524489305783756.6839276491811;
 Mon, 23 Apr 2018 06:15:05 -0700 (PDT)
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 F25BC83F43;
	Mon, 23 Apr 2018 13:15:03 +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 752D7781AE;
	Mon, 23 Apr 2018 13:15:03 +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 DB66B62D0E;
	Mon, 23 Apr 2018 13:15:02 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDEvmw022063 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:14:57 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 2CADB2166BC6; Mon, 23 Apr 2018 13:14:57 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 8919D2166BAD;
	Mon, 23 Apr 2018 13:14:56 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:37 +0200
Message-Id: 
 <be734770b5f0de446581da66636dc59046809748.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 02/11] 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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]);
 Mon, 23 Apr 2018 13:15:04 +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>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/libvirt_private.syms  |  1 +
 src/qemu/qemu_domain.c    |  8 ++++++++
 src/util/virstoragefile.c | 19 +++++++++++++++++++
 src/util/virstoragefile.h |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index f81cb5df93..27c5bb5bce 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2799,6 +2799,7 @@ virStorageNetHostTransportTypeToString;
 virStorageNetProtocolTypeToString;
 virStoragePRDefFormat;
 virStoragePRDefFree;
+virStoragePRDefIsEqual;
 virStoragePRDefParseXML;
 virStorageSourceBackingStoreClear;
 virStorageSourceClear;
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 326c939c85..0dc5a88e79 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7836,6 +7836,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 42ef24e9d5..d0050eca1f 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2022,6 +2022,25 @@ 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 69e7e20e17..09e9ae73f1 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -382,6 +382,8 @@ void virStoragePRDefFree(virStoragePRDefPtr prd);
 virStoragePRDefPtr virStoragePRDefParseXML(xmlXPathContextPtr ctxt);
 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 Thu May  2 20:23:22 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 1524489305755427.24960653184917;
 Mon, 23 Apr 2018 06:15:05 -0700 (PDT)
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 08B57326227D;
	Mon, 23 Apr 2018 13:15:04 +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 8601A77DB7;
	Mon, 23 Apr 2018 13:15:03 +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 05AFE62D0F;
	Mon, 23 Apr 2018 13:15:03 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDEw77022075 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:14:58 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 0BED7215CDC8; Mon, 23 Apr 2018 13:14:58 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6893D215CDCC;
	Mon, 23 Apr 2018 13:14:57 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:38 +0200
Message-Id: 
 <291902cd151b6f7e3836606346a2642ac57fffa0.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 03/11] 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.45]);
 Mon, 23 Apr 2018 13:15:04 +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>
Reviewed-by: John Ferlan <jferlan@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 833c75514c..d67b859d75 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -473,6 +473,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
               /* 290 */
               "query-cpus-fast",
               "disk-write-cache",
+              "pr-manager-helper",
     );
=20
=20
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index f08cfc2611..bb74ad05d4 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -457,6 +457,7 @@ typedef enum {
     /* 290 */
     QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */
     QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cach=
e param */
+    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 Thu May  2 20:23:22 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 1524489314669107.03851354698497;
 Mon, 23 Apr 2018 06:15:14 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
 [10.5.11.16])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id 3876381DE5;
	Mon, 23 Apr 2018 13:15: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 D18D078DD7;
	Mon, 23 Apr 2018 13:15: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 1517B1853DDE;
	Mon, 23 Apr 2018 13:15:12 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDEwli022085 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:14:59 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DFAE72166BC6; Mon, 23 Apr 2018 13:14:58 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 47A6F215CDCC;
	Mon, 23 Apr 2018 13:14:58 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:39 +0200
Message-Id: 
 <0abc0c82bba9dbfecbda909d21ea9e322e4acd9e.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 04/11] qemu: Generate pr 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.16
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]);
 Mon, 23 Apr 2018 13:15:13 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

For command line we need two things:

1) -object pr-manager-helper,id=3D$alias,path=3D$socketPath
2) -drive file.pr-manager=3D$alias

In -object pr-manager-helper we tell qemu which socket to connect
to, then in -drive file-pr-manager we just reference the object
the drive in question should use.

For managed PR helper the alias is always "pr-helper0" and socket
path "${vm->priv->libDir}/pr-helper0.sock".

It was decided in reviews to previous versions of this patch that
it should not allocate memory in order to simplify code. This
promise is not fulfilled though. For instance,
qemuBuildPRManagerInfoProps() is an offender.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/libvirt_private.syms                           |   2 +
 src/qemu/qemu_alias.c                              |  18 +++
 src/qemu/qemu_alias.h                              |   4 +
 src/qemu/qemu_command.c                            | 134 +++++++++++++++++=
++++
 src/qemu/qemu_command.h                            |   5 +
 src/qemu/qemu_domain.c                             |  22 ++++
 src/qemu/qemu_domain.h                             |   3 +
 src/qemu/qemu_process.h                            |   1 +
 src/util/virstoragefile.c                          |  14 +++
 src/util/virstoragefile.h                          |   2 +
 .../disk-virtio-scsi-reservations.args             |  38 ++++++
 tests/qemuxml2argvtest.c                           |   4 +
 12 files changed, 247 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/disk-virtio-scsi-reservations.ar=
gs

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 27c5bb5bce..108b44f6f4 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2799,7 +2799,9 @@ virStorageNetHostTransportTypeToString;
 virStorageNetProtocolTypeToString;
 virStoragePRDefFormat;
 virStoragePRDefFree;
+virStoragePRDefIsEnabled;
 virStoragePRDefIsEqual;
+virStoragePRDefIsManaged;
 virStoragePRDefParseXML;
 virStorageSourceBackingStoreClear;
 virStorageSourceClear;
diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
index 95d1e0370a..9a3a92c82d 100644
--- a/src/qemu/qemu_alias.c
+++ b/src/qemu/qemu_alias.c
@@ -773,3 +773,21 @@ qemuAliasChardevFromDevAlias(const char *devAlias)
=20
     return ret;
 }
+
+
+const char *
+qemuDomainGetManagedPRAlias(void)
+{
+    return "pr-helper0";
+}
+
+
+char *
+qemuDomainGetUnmanagedPRAlias(const virDomainDiskDef *disk)
+{
+    char *ret;
+
+    ignore_value(virAsprintf(&ret, "pr-helper-%s", disk->info.alias));
+
+    return ret;
+}
diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
index 8c744138ce..8e391c3f0c 100644
--- a/src/qemu/qemu_alias.h
+++ b/src/qemu/qemu_alias.h
@@ -92,4 +92,8 @@ char *qemuAliasTLSObjFromSrcAlias(const char *srcAlias)
 char *qemuAliasChardevFromDevAlias(const char *devAlias)
     ATTRIBUTE_NONNULL(1);
=20
+const char * qemuDomainGetManagedPRAlias(void);
+
+char *qemuDomainGetUnmanagedPRAlias(const virDomainDiskDef *disk);
+
 #endif /* __QEMU_ALIAS_H__*/
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index b666f3715f..8b1b5934b1 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -1462,6 +1462,28 @@ qemuDiskSourceGetProps(virStorageSourcePtr src)
 }
=20
=20
+static int
+qemuBuildDriveSourcePR(virBufferPtr buf,
+                       virDomainDiskDefPtr disk)
+{
+    char *alias =3D NULL;
+    const char *defaultAlias =3D NULL;
+
+    if (!virStoragePRDefIsEnabled(disk->src->pr))
+        return 0;
+
+    if (virStoragePRDefIsManaged(disk->src->pr))
+        defaultAlias =3D qemuDomainGetManagedPRAlias();
+    else if (!(alias =3D qemuDomainGetUnmanagedPRAlias(disk)))
+        return -1;
+
+
+    virBufferAsprintf(buf, ",file.pr-manager=3D%s", alias ? alias : defaul=
tAlias);
+    VIR_FREE(alias);
+    return 0;
+}
+
+
 static int
 qemuBuildDriveSourceStr(virDomainDiskDefPtr disk,
                         virQEMUCapsPtr qemuCaps,
@@ -1539,6 +1561,9 @@ qemuBuildDriveSourceStr(virDomainDiskDefPtr disk,
=20
         if (disk->src->debug)
             virBufferAsprintf(buf, ",file.debug=3D%d", disk->src->debugLev=
el);
+
+        if (qemuBuildDriveSourcePR(buf, disk) < 0)
+            goto cleanup;
     } else {
         if (!(source =3D virQEMUBuildDriveCommandlineFromJSON(srcprops)))
             goto cleanup;
@@ -9665,6 +9690,112 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
 }
=20
=20
+/**
+ * qemuBuildPRManagerInfoProps:
+ * @prd: disk PR runtime info
+ * @propsret: JSON properties to return
+ *
+ * Build the JSON properties for the pr-manager object.
+ *
+ * Returns: 0 on success (@propsret is NULL if no properties are needed),
+ *         -1 on failure (with error message set).
+ */
+int
+qemuBuildPRManagerInfoProps(virDomainObjPtr vm,
+                            const virDomainDiskDef *disk,
+                            virJSONValuePtr *propsret,
+                            char **aliasret)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+    char *socketPath =3D NULL;
+    char *alias =3D NULL;
+    int ret =3D -1;
+
+    *propsret =3D NULL;
+    *aliasret =3D NULL;
+
+    if (!virStoragePRDefIsEnabled(disk->src->pr))
+        return 0;
+
+    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_PR_MANAGER_HELPER)) {
+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                       _("reservations not supported with this QEMU binary=
"));
+        return ret;
+    }
+
+    if (!(socketPath =3D qemuDomainGetPRSocketPath(vm, disk->src->pr)))
+        return ret;
+
+    if (virStoragePRDefIsManaged(disk->src->pr)) {
+        if (VIR_STRDUP(alias, qemuDomainGetManagedPRAlias()) < 0)
+            goto cleanup;
+    } else {
+        if (!(alias =3D qemuDomainGetUnmanagedPRAlias(disk)))
+            goto cleanup;
+    }
+
+    if (virJSONValueObjectCreate(propsret,
+                                 "s:path", socketPath,
+                                 NULL) < 0)
+        goto cleanup;
+
+    VIR_STEAL_PTR(*aliasret, alias);
+    ret =3D 0;
+ cleanup:
+    VIR_FREE(alias);
+    VIR_FREE(socketPath);
+    return ret;
+}
+
+
+static int
+qemuBuildMasterPRCommandLine(virDomainObjPtr vm,
+                             virCommandPtr cmd,
+                             const virDomainDef *def)
+{
+    size_t i;
+    bool managedAdded =3D false;
+    virJSONValuePtr props =3D NULL;
+    char *alias =3D NULL;
+    char *tmp =3D NULL;
+    int ret =3D -1;
+
+    for (i =3D 0; i < def->ndisks; i++) {
+        const virDomainDiskDef *disk =3D def->disks[i];
+
+        if (virStoragePRDefIsManaged(disk->src->pr)) {
+            if (managedAdded)
+                continue;
+
+            managedAdded =3D true;
+        }
+
+        if (qemuBuildPRManagerInfoProps(vm, disk, &props, &alias) < 0)
+            goto cleanup;
+
+        if (!props)
+            continue;
+
+        if (!(tmp =3D virQEMUBuildObjectCommandlineFromJSON("pr-manager-he=
lper",
+                                                          alias,
+                                                          props)))
+            goto cleanup;
+        VIR_FREE(alias);
+        virJSONValueFree(props);
+        props =3D NULL;
+
+        virCommandAddArgList(cmd, "-object", tmp, NULL);
+        VIR_FREE(tmp);
+    }
+
+    ret =3D 0;
+ cleanup:
+    VIR_FREE(alias);
+    virJSONValueFree(props);
+    return ret;
+}
+
+
 /**
  * qemuBuildCommandLineValidate:
  *
@@ -9833,6 +9964,9 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
     if (qemuBuildMasterKeyCommandLine(cmd, priv) < 0)
         goto error;
=20
+    if (qemuBuildMasterPRCommandLine(vm, cmd, def) < 0)
+        goto error;
+
     if (enableFips)
         virCommandAddArg(cmd, "-enable-fips");
=20
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 31c9da673c..da1fe679fe 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -54,6 +54,11 @@ virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driv=
er,
                                    size_t *nnicindexes,
                                    int **nicindexes);
=20
+/* Generate the object properties for pr-manager */
+int qemuBuildPRManagerInfoProps(virDomainObjPtr vm,
+                                const virDomainDiskDef *disk,
+                                virJSONValuePtr *propsret,
+                                char **alias);
=20
 /* Generate the object properties for a secret */
 int qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo,
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 0dc5a88e79..53827d5396 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -11983,3 +11983,25 @@ qemuProcessEventFree(struct qemuProcessEvent *even=
t)
     }
     VIR_FREE(event);
 }
+
+
+char *
+qemuDomainGetPRSocketPath(virDomainObjPtr vm,
+                          virStoragePRDefPtr pr)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+    const char *defaultAlias =3D NULL;
+    char *ret =3D NULL;
+
+    if (!virStoragePRDefIsEnabled(pr))
+        return NULL;
+
+    if (virStoragePRDefIsManaged(pr)) {
+        defaultAlias =3D qemuDomainGetManagedPRAlias();
+        ignore_value(virAsprintf(&ret, "%s/%s.sock", priv->libDir, default=
Alias));
+    } else {
+        ignore_value(VIR_STRDUP(ret, pr->path));
+    }
+
+    return ret;
+}
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 2c27dfb9f3..612d234113 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -1000,4 +1000,7 @@ qemuDomainDiskCachemodeFlags(int cachemode,
                              bool *direct,
                              bool *noflush);
=20
+char * qemuDomainGetPRSocketPath(virDomainObjPtr vm,
+                                 virStoragePRDefPtr pr);
+
 #endif /* __QEMU_DOMAIN_H__ */
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 9dd5c97642..3bf66f71b7 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -24,6 +24,7 @@
=20
 # include "qemu_conf.h"
 # include "qemu_domain.h"
+# include "virstoragefile.h"
=20
 int qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig,
                                  const char *domainDir);
diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index d0050eca1f..e22dd727fa 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -2041,6 +2041,20 @@ virStoragePRDefIsEqual(virStoragePRDefPtr a,
 }
=20
=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 09e9ae73f1..059214a517 100644
--- a/src/util/virstoragefile.h
+++ b/src/util/virstoragefile.h
@@ -384,6 +384,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,
diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args b/te=
sts/qemuxml2argvdata/disk-virtio-scsi-reservations.args
new file mode 100644
index 0000000000..dce3fc4105
--- /dev/null
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.args
@@ -0,0 +1,38 @@
+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 \
+-object pr-manager-helper,id=3Dpr-helper-scsi0-0-0-1,\
+path=3D/path/to/qemu-pr-helper.sock \
+-machine pc,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
+-m 214 \
+-smp 8,sockets=3D8,cores=3D1,threads=3D1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-display none \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=3Dcharmonitor,path=3D/tmp/lib/domain--1-QEMUGuest1/moni=
tor.sock,\
+server,nowait \
+-mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \
+-rtc base=3Dutc \
+-no-shutdown \
+-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 \
+-drive file=3D/dev/HostVG/QEMUGuest2,file.pr-manager=3Dpr-helper-scsi0-0-0=
-1,\
+format=3Draw,if=3Dnone,id=3Ddrive-scsi0-0-0-1 \
+-device scsi-block,bus=3Dscsi0.0,channel=3D0,scsi-id=3D0,lun=3D1,\
+drive=3Ddrive-scsi0-0-0-1,id=3Dscsi0-0-0-1 \
+-device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x4
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 74d930ebe2..ad17a5c333 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2814,6 +2814,10 @@ mymain(void)
             QEMU_CAPS_PIIX_DISABLE_S3, QEMU_CAPS_PIIX_DISABLE_S4,
             QEMU_CAPS_ICH9_USB_EHCI1);
=20
+    DO_TEST("disk-virtio-scsi-reservations",
+            QEMU_CAPS_DRIVE_BOOT, QEMU_CAPS_VIRTIO_SCSI,
+            QEMU_CAPS_SCSI_BLOCK, QEMU_CAPS_PR_MANAGER_HELPER);
+
     /* Test disks with format probing enabled for legacy reasons.
      * New tests should not go in this section. */
     driver.config->allowDiskFormatProbing =3D true;
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu May  2 20:23:22 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 1524489314470579.7891201905998;
 Mon, 23 Apr 2018 06:15:14 -0700 (PDT)
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 0A2F63134EA8;
	Mon, 23 Apr 2018 13:15:13 +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 A2EE578BB2;
	Mon, 23 Apr 2018 13:15: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 09D5062D13;
	Mon, 23 Apr 2018 13:15:12 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDExGo022091 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:15:00 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id BF856215CDCC; Mon, 23 Apr 2018 13:14:59 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 27A5B215CDCB;
	Mon, 23 Apr 2018 13:14:59 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:40 +0200
Message-Id: 
 <26450392e4b2f9a6d5801b6ec3ceff786ab99c46.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 05/11] qemu_ns: Allow /dev/mapper/control for PR
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.45]);
 Mon, 23 Apr 2018 13:15:13 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

If qemu-pr-helper is compiled with multipath support the first
thing it does is open /dev/mapper/control. Since we're going
to be running it inside qemu namespace we need to create it
there. Unfortunately, we don't know if it was compiled with or
without multipath so we have to create it anyway.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/qemu/qemu_domain.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 53827d5396..5ccdeb8e3a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -109,6 +109,7 @@ VIR_ENUM_IMPL(qemuDomainNamespace, QEMU_DOMAIN_NS_LAST,
 #define PROC_MOUNTS "/proc/mounts"
 #define DEVPREFIX "/dev/"
 #define DEV_VFIO "/dev/vfio/vfio"
+#define DEVICE_MAPPER_CONTROL_PATH "/dev/mapper/control"
=20
=20
 struct _qemuDomainLogContext {
@@ -10207,6 +10208,11 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg ATT=
RIBUTE_UNUSED,
             goto cleanup;
     }
=20
+    /* qemu-pr-helper might require access to /dev/mapper/control. */
+    if (virStoragePRDefIsEnabled(disk->src->pr) &&
+        qemuDomainCreateDevice(DEVICE_MAPPER_CONTROL_PATH, data, true) < 0)
+        goto cleanup;
+
     ret =3D 0;
  cleanup:
     VIR_FREE(dst);
@@ -11218,6 +11224,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
     virStorageSourcePtr next;
     const char **paths =3D NULL;
     size_t npaths =3D 0;
+    char *dmPath =3D NULL;
     int ret =3D -1;
=20
     if (!qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
@@ -11234,11 +11241,18 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
             goto cleanup;
     }
=20
+    /* qemu-pr-helper might require access to /dev/mapper/control. */
+    if (virStoragePRDefIsEnabled(src->pr) &&
+        (VIR_STRDUP(dmPath, DEVICE_MAPPER_CONTROL_PATH) < 0 ||
+         VIR_APPEND_ELEMENT_COPY(paths, npaths, dmPath) < 0))
+        goto cleanup;
+
     if (qemuDomainNamespaceMknodPaths(vm, paths, npaths) < 0)
         goto cleanup;
=20
     ret =3D 0;
  cleanup:
+    VIR_FREE(dmPath);
     VIR_FREE(paths);
     return ret;
 }
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu May  2 20:23:22 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 1524489322575912.8769527953583;
 Mon, 23 Apr 2018 06:15:22 -0700 (PDT)
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 3932F81240;
	Mon, 23 Apr 2018 13:15: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 EB3FC18A49;
	Mon, 23 Apr 2018 13:15:20 +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 9325E62D1F;
	Mon, 23 Apr 2018 13:15:20 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDF0rT022101 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:15:00 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 9F1472166BC6; Mon, 23 Apr 2018 13:15:00 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 073222166BAD;
	Mon, 23 Apr 2018 13:14:59 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:41 +0200
Message-Id: 
 <9935b385d691e2534f5d87024a36d61861f27aea.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 06/11] qemu_cgroup: Allow /dev/mapper/control
	for PR
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.25]);
 Mon, 23 Apr 2018 13:15:21 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

Just like in previous commit, qemu-pr-helper might want to open
/dev/mapper/control under certain circumstances. Therefore we
have to allow it in cgroups.

The change virdevmapper.c might look spurious but it isn't. After
6dd84f6850ca437 any path that we're allowing in deivces CGroup is
subject to virDevMapperGetTargets() inspection. And libdevmapper
returns ENXIO for the path from subject.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/qemu/qemu_cgroup.c  | 33 ++++++++++++++++++++++++++++++---
 src/util/virdevmapper.c |  8 +++++++-
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index d88eb7881f..546a4c8e63 100644
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -114,6 +114,8 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm,
 }
=20
=20
+#define DEVICE_MAPPER_CONTROL_PATH "/dev/mapper/control"
+
 static int
 qemuSetupImageCgroupInternal(virDomainObjPtr vm,
                              virStorageSourcePtr src,
@@ -125,6 +127,10 @@ qemuSetupImageCgroupInternal(virDomainObjPtr vm,
         return 0;
     }
=20
+    if (virStoragePRDefIsManaged(src->pr) &&
+        qemuSetupImagePathCgroup(vm, DEVICE_MAPPER_CONTROL_PATH, false) < =
0)
+        return -1;
+
     return qemuSetupImagePathCgroup(vm, src->path, src->readonly || forceR=
eadonly);
 }
=20
@@ -142,9 +148,8 @@ qemuTeardownImageCgroup(virDomainObjPtr vm,
                         virStorageSourcePtr src)
 {
     qemuDomainObjPrivatePtr priv =3D vm->privateData;
-    int perms =3D VIR_CGROUP_DEVICE_READ |
-                VIR_CGROUP_DEVICE_WRITE |
-                VIR_CGROUP_DEVICE_MKNOD;
+    int perms =3D VIR_CGROUP_DEVICE_RWM;
+    size_t i;
     int ret;
=20
     if (!virCgroupHasController(priv->cgroup,
@@ -157,6 +162,28 @@ qemuTeardownImageCgroup(virDomainObjPtr vm,
         return 0;
     }
=20
+    for (i =3D 0; i < vm->def->ndisks; i++) {
+        virStorageSourcePtr diskSrc =3D vm->def->disks[i]->src;
+
+        if (src =3D=3D diskSrc)
+            continue;
+
+        if (virStoragePRDefIsManaged(diskSrc->pr))
+            break;
+    }
+
+    if (i =3D=3D vm->def->ndisks) {
+        VIR_DEBUG("Disabling device mapper control");
+        ret =3D virCgroupDenyDevicePath(priv->cgroup,
+                                      DEVICE_MAPPER_CONTROL_PATH, perms, t=
rue);
+        virDomainAuditCgroupPath(vm, priv->cgroup, "deny",
+                                 DEVICE_MAPPER_CONTROL_PATH,
+                                 virCgroupGetDevicePermsString(perms), ret=
);
+        if (ret < 0)
+            return ret;
+    }
+
+
     VIR_DEBUG("Deny path %s", src->path);
=20
     ret =3D virCgroupDenyDevicePath(priv->cgroup, src->path, perms, true);
diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
index d2c25af003..ef4b1e480a 100644
--- a/src/util/virdevmapper.c
+++ b/src/util/virdevmapper.c
@@ -101,8 +101,14 @@ virDevMapperGetTargetsImpl(const char *path,
=20
     dm_task_no_open_count(dmt);
=20
-    if (!dm_task_run(dmt))
+    if (!dm_task_run(dmt)) {
+        if (errno =3D=3D ENXIO) {
+            /* In some cases devmapper realizes this late device
+             * is not managed by it. */
+            ret =3D 0;
+        }
         goto cleanup;
+    }
=20
     if (!dm_task_get_info(dmt, &info))
         goto cleanup;
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu May  2 20:23:22 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 1524489321354633.7734093475509;
 Mon, 23 Apr 2018 06:15:21 -0700 (PDT)
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 CCBDE3004401;
	Mon, 23 Apr 2018 13:15:19 +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 9614778BA6;
	Mon, 23 Apr 2018 13:15:19 +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 E7CCD1853E1E;
	Mon, 23 Apr 2018 13:15:18 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDF1vj022108 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:15:01 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 7F296215CDC8; Mon, 23 Apr 2018 13:15:01 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id DB15F2166BAD;
	Mon, 23 Apr 2018 13:15:00 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:42 +0200
Message-Id: 
 <811d4bc4df0bd95d553a648b49720b14490ee5ba.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 07/11] 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.11
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]);
 Mon, 23 Apr 2018 13:15:20 +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>
Reviewed-by: John Ferlan <jferlan@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 b9bafdab90..80e1d3ad46 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/bin/qemu-pr-helper],
+               [/usr/bin:/usr/libexec])
+  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 c19bf3a43a..2dc16e91fd 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 34441857bd..31738ff19c 100644
--- a/src/qemu/qemu.conf
+++ b/src/qemu/qemu.conf
@@ -779,3 +779,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 LUN devices.
+#pr_helper =3D "/usr/bin/qemu-pr-helper"
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index bfbb572f01..277ab833a8 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -302,7 +302,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;
@@ -387,6 +388,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);
@@ -754,6 +756,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 e1ad5463f3..7a63780c48 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 688e5b9fda..95885e9f06 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/bin/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 Thu May  2 20:23:22 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 1524489326749703.2337370264078;
 Mon, 23 Apr 2018 06:15:26 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id DD8243182F5D;
	Mon, 23 Apr 2018 13:15:24 +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 5BC04173D9;
	Mon, 23 Apr 2018 13:15: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 0DC4465D13;
	Mon, 23 Apr 2018 13:15:24 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDF2Tq022119 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:15:02 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 6024B215CDC8; Mon, 23 Apr 2018 13:15:02 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id BC678215CDCE;
	Mon, 23 Apr 2018 13:15:01 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:43 +0200
Message-Id: 
 <01f9387202041ca4093893a98726be3d3baafebc.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 08/11] qemu: Start PR daemon 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.15
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]);
 Mon, 23 Apr 2018 13:15:25 +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().

Again, despite demand to not store anything in status XML I have
to take my chances and store 'priv->prDaemonRunning' (at least)
in status XML. Otherwise we might forget whether we started
pr-helper after libvirtd restart.

What happens if we change default managed alias or default socket
is undefined for now, because we don't store them in status XML.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/qemu/qemu_domain.c  |  22 +++++
 src/qemu/qemu_domain.h  |   2 +
 src/qemu/qemu_process.c | 232 ++++++++++++++++++++++++++++++++++++++++++++=
++++
 3 files changed, 256 insertions(+)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 5ccdeb8e3a..fbe6a0f332 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2040,6 +2040,15 @@ qemuDomainObjPrivateXMLFormatAllowReboot(virBufferPt=
r buf,
 }
=20
=20
+static void
+qemuDomainObjPrivateXMLFormatPR(virBufferPtr buf,
+                                qemuDomainObjPrivatePtr priv)
+{
+    if (priv->prDaemonRunning)
+        virBufferAddLit(buf, "<prDaemon running=3D'1'/>\n");
+}
+
+
 static int
 qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf,
                                  virDomainObjPtr vm,
@@ -2180,6 +2189,8 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf,
=20
     qemuDomainObjPrivateXMLFormatAllowReboot(buf, priv->allowReboot);
=20
+    qemuDomainObjPrivateXMLFormatPR(buf, priv);
+
     if (qemuDomainObjPrivateXMLFormatBlockjobs(buf, vm) < 0)
         return -1;
=20
@@ -2323,6 +2334,15 @@ qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathCont=
extPtr ctxt,
 }
=20
=20
+static void
+qemuDomainObjPrivateXMLParsePR(xmlXPathContextPtr ctxt,
+                               bool *prDaemonRunning)
+{
+    *prDaemonRunning =3D virXPathBoolean("count(./prDaemon[@running =3D '1=
']) > 0",
+                                       ctxt) > 0;
+}
+
+
 static int
 qemuDomainObjPrivateXMLParseJob(virDomainObjPtr vm,
                                 qemuDomainObjPrivatePtr priv,
@@ -2572,6 +2592,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
=20
     qemuDomainObjPrivateXMLParseAllowReboot(ctxt, &priv->allowReboot);
=20
+    qemuDomainObjPrivateXMLParsePR(ctxt, &priv->prDaemonRunning);
+
     if (qemuDomainObjPrivateXMLParseBlockjobs(priv, ctxt) < 0)
         goto error;
=20
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 612d234113..b837902e8d 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;
+
+    bool prDaemonRunning;
 };
=20
 # define QEMU_DOMAIN_PRIVATE(vm) \
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 6a5262ae46..36cfa438ed 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2555,6 +2555,231 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
 }
=20
=20
+static char *
+qemuProcessBuildPRHelperPidfilePath(virDomainObjPtr vm,
+                                    const char *prdAlias)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+
+    return virPidFileBuildPath(priv->libDir, prdAlias);
+}
+
+
+static void
+qemuProcessKillPRDaemon(virDomainObjPtr vm)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+    virErrorPtr orig_err;
+    const char *prdAlias;
+    char *pidfile;
+
+    if (!priv->prDaemonRunning)
+        return;
+
+    if (!(prdAlias =3D qemuDomainGetManagedPRAlias())) {
+        VIR_WARN("Unable to get default PR manager alias");
+        return;
+    }
+
+    if (!(pidfile =3D qemuProcessBuildPRHelperPidfilePath(vm, prdAlias))) {
+        VIR_WARN("Unable to construct pr-helper pidfile path");
+        return;
+    }
+
+    virErrorPreserveLast(&orig_err);
+    if (virPidFileForceCleanupPath(pidfile) < 0) {
+        VIR_WARN("Unable to kill pr-helper process");
+    } else {
+        if (unlink(pidfile) < 0 &&
+            errno !=3D ENOENT) {
+            virReportSystemError(errno,
+                                 _("Unable to remove stale pidfile %s"),
+                                 pidfile);
+        } else {
+            priv->prDaemonRunning =3D false;
+        }
+    }
+    virErrorRestore(&orig_err);
+
+    VIR_FREE(pidfile);
+}
+
+
+static int
+qemuProcessStartPRDaemonHook(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
+qemuProcessStartPRDaemon(virDomainObjPtr vm,
+                         const virDomainDiskDef *disk)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+    virQEMUDriverPtr driver =3D priv->driver;
+    virQEMUDriverConfigPtr cfg;
+    const char *prdAlias;
+    int errfd =3D -1;
+    char *pidfile =3D NULL;
+    int pidfd =3D -1;
+    char *socketPath =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 (!virStoragePRDefIsManaged(disk->src->pr) ||
+        priv->prDaemonRunning)
+        return 0;
+
+    cfg =3D virQEMUDriverGetConfig(driver);
+
+    if (!virFileIsExecutable(cfg->prHelperName)) {
+        virReportSystemError(errno, _("'%s' is not a suitable pr helper"),
+                             cfg->prHelperName);
+        goto cleanup;
+    }
+
+    prdAlias =3D qemuDomainGetManagedPRAlias();
+
+    if (!(pidfile =3D qemuProcessBuildPRHelperPidfilePath(vm, prdAlias)))
+        goto cleanup;
+
+    /* Just try to acquire. Dummy pid will be replaced later */
+    if ((pidfd =3D virPidFileAcquirePath(pidfile, false, -1)) < 0)
+        goto cleanup;
+
+    if (!(socketPath =3D qemuDomainGetPRSocketPath(vm, disk->src->pr)))
+        goto cleanup;
+
+    /* Remove stale socket */
+    if (unlink(socketPath) < 0 &&
+        errno !=3D ENOENT) {
+        virReportSystemError(errno,
+                             _("Unable to remove stale socket path: %s"),
+                             socketPath);
+        goto cleanup;
+    }
+
+    if (!(cmd =3D virCommandNewArgList(cfg->prHelperName,
+                                     "-k", socketPath,
+                                     "-f", pidfile,
+                                     NULL)))
+        goto cleanup;
+
+    virCommandDaemonize(cmd);
+    /* We want our virCommand to write child PID into the pidfile
+     * so that we can read it even before exec(). */
+    virCommandSetPidFile(cmd, pidfile);
+    virCommandSetErrorFD(cmd, &errfd);
+
+    /* Place the process into the same namespace and cgroup as
+     * qemu (so that it shares the same view of the system). */
+    virCommandSetPreExecHook(cmd, qemuProcessStartPRDaemonHook, 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"), prdAlias);
+        goto cleanup;
+    }
+
+    if (virTimeBackOffStart(&timebackoff, 1, timeout) < 0)
+        goto cleanup;
+    while (virTimeBackOffWait(&timebackoff)) {
+        char errbuf[1024] =3D { 0 };
+
+        if (virFileExists(socketPath))
+            break;
+
+        if (virProcessKill(cpid, 0) =3D=3D 0)
+            continue;
+
+        if (saferead(errfd, errbuf, sizeof(errbuf) - 1) < 0) {
+            virReportSystemError(errno,
+                                 _("pr helper %s died unexpectedly"), prdA=
lias);
+        } else {
+            virReportError(VIR_ERR_OPERATION_FAILED,
+                           _("pr helper died and reported: %s"), errbuf);
+        }
+        goto cleanup;
+    }
+
+    if (!virFileExists(socketPath)) {
+        virReportError(VIR_ERR_OPERATION_TIMEOUT, "%s",
+                       _("pr helper socked did not show up"));
+        goto cleanup;
+    }
+
+    if (priv->cgroup &&
+        virCgroupAddMachineTask(priv->cgroup, cpid) < 0)
+        goto cleanup;
+
+    if (qemuSecurityDomainSetPathLabel(driver->securityManager,
+                                       vm->def, socketPath, true) < 0)
+        goto cleanup;
+
+    priv->prDaemonRunning =3D true;
+    ret =3D 1;
+ cleanup:
+    if (ret < 0) {
+        virCommandAbort(cmd);
+        if (cpid >=3D 0)
+            virProcessKillPainfully(cpid, true);
+        if (pidfile)
+            unlink(pidfile);
+    }
+    virCommandFree(cmd);
+    VIR_FREE(socketPath);
+    VIR_FORCE_CLOSE(pidfd);
+    VIR_FREE(pidfile);
+    VIR_FORCE_CLOSE(errfd);
+    virObjectUnref(cfg);
+    return ret;
+}
+
+
+static int
+qemuProcessMaybeStartPRDaemon(virDomainObjPtr vm)
+{
+    size_t i;
+    int rv;
+
+    for (i =3D 0; i < vm->def->ndisks; i++) {
+        const virDomainDiskDef *disk =3D vm->def->disks[i];
+
+        if ((rv =3D qemuProcessStartPRDaemon(vm, disk)) < 0)
+            return -1;
+
+        if (rv > 0)
+            return 1;
+    }
+
+    return 0;
+}
+
+
 static int
 qemuProcessInitPasswords(virQEMUDriverPtr driver,
                          virDomainObjPtr vm,
@@ -6071,6 +6296,10 @@ qemuProcessLaunch(virConnectPtr conn,
     if (qemuProcessResctrlCreate(driver, vm) < 0)
         goto cleanup;
=20
+    VIR_DEBUG("Setting up PR daemon");
+    if (qemuProcessMaybeStartPRDaemon(vm) < 0)
+        goto cleanup;
+
     VIR_DEBUG("Setting domain security labels");
     if (qemuSecuritySetAllLabel(driver,
                                 vm,
@@ -6598,6 +6827,9 @@ void qemuProcessStop(virQEMUDriverPtr driver,
     /* Remove the master key */
     qemuDomainMasterKeyRemove(priv);
=20
+    /* Do this before we delete the tree and remove pidfile. */
+    qemuProcessKillPRDaemon(vm);
+
     virFileDeleteTree(priv->libDir);
     virFileDeleteTree(priv->channelTargetDir);
=20
--=20
2.16.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
From nobody Thu May  2 20:23:22 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 1524489332385140.2016960153561;
 Mon, 23 Apr 2018 06:15:32 -0700 (PDT)
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 DF98D8765D;
	Mon, 23 Apr 2018 13:15: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 704B167654;
	Mon, 23 Apr 2018 13:15: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 AC19565D17;
	Mon, 23 Apr 2018 13:15:29 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDF3Ev022125 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:15:03 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 4096E215CDC8; Mon, 23 Apr 2018 13:15:03 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 9C7D1215CDCC;
	Mon, 23 Apr 2018 13:15:02 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:44 +0200
Message-Id: 
 <3ff6480d2485675aedf46a0b2ea303401c258dfb.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 09/11] 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.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]);
 Mon, 23 Apr 2018 13:15:31 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

When attaching a disk that requires pr-manager we might need to
plug the pr-manager object and start the pr-helper process.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/qemu/qemu_hotplug.c | 93 +++++++++++++++++++++++++++++++++++++++++++++=
++--
 src/qemu/qemu_process.c |  4 +--
 src/qemu/qemu_process.h |  5 +++
 3 files changed, 97 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index df9e8aa716..2e736873d1 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -348,6 +348,63 @@ qemuDomainChangeEjectableMedia(virQEMUDriverPtr driver,
 }
=20
=20
+/**
+ * qemuDomainMaybeStartPRDaemon:
+ * @vm: domain object
+ * @disk: disk to hotplug
+ *
+ * Checks if it's needed to start qemu-pr-helper and starts it.
+ *
+ * Returns: 0 if qemu-pr-helper is not needed
+ *          1 if it is needed and was started
+ *         -1 otherwise.
+ */
+static int
+qemuDomainMaybeStartPRDaemon(virDomainObjPtr vm,
+                             virDomainDiskDefPtr disk)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+
+    if (!virStoragePRDefIsManaged(disk->src->pr)) {
+        /* @disk itself does not require qemu-pr-helper. */
+        return 0;
+    }
+
+    if (priv->prDaemonRunning) {
+        /* @disk requires qemu-pr-helper but there's already one running. =
*/
+        return 0;
+    }
+
+    /* @disk requires qemu-pr-helper but none is running.
+     * Start it now. */
+    if (qemuProcessStartPRDaemon(vm, disk) < 0)
+        return -1;
+
+    return 1;
+}
+
+
+static int
+qemuMaybeBuildPRManagerInfoProps(virDomainObjPtr vm,
+                                 const virDomainDiskDef *disk,
+                                 virJSONValuePtr *propsret,
+                                 char **aliasret)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+
+    *propsret =3D NULL;
+    *aliasret =3D NULL;
+
+    if (virStoragePRDefIsManaged(disk->src->pr) &&
+        priv->prDaemonRunning) {
+        /* @disk requires qemu-pr-helper but there's already one running. =
*/
+        return 0;
+    }
+
+    return qemuBuildPRManagerInfoProps(vm, disk, propsret, aliasret);
+}
+
+
 /**
  * qemuDomainAttachDiskGeneric:
  *
@@ -365,12 +422,16 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
     char *devstr =3D NULL;
     char *drivestr =3D NULL;
     char *drivealias =3D NULL;
+    char *prmgrAlias =3D NULL;
     bool driveAdded =3D false;
     bool secobjAdded =3D false;
     bool encobjAdded =3D false;
+    bool prmgrAdded =3D false;
+    bool prdStarted =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;
@@ -398,6 +459,17 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
     if (encinfo && qemuBuildSecretInfoProps(encinfo, &encobjProps) < 0)
         goto error;
=20
+    if (qemuMaybeBuildPRManagerInfoProps(vm, disk, &prmgrProps, &prmgrAlia=
s) < 0)
+        goto error;
+
+    /* Start daemon only after prmgrProps is built. Otherwise
+     * qemuDomainMaybeStartPRDaemon() might start daemon and set
+     * priv->prDaemonRunning which confuses props building code. */
+    if ((rv =3D qemuDomainMaybeStartPRDaemon(vm, disk)) < 0)
+        goto error;
+    else if (rv > 0)
+        prdStarted =3D true;
+
     if (disk->src->haveTLS &&
         qemuDomainAddDiskSrcTLSObject(driver, vm, disk->src,
                                       disk->info.alias) < 0)
@@ -435,6 +507,15 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
         encobjAdded =3D true;
     }
=20
+    if (prmgrProps) {
+        rv =3D qemuMonitorAddObject(priv->mon, "pr-manager-helper", prmgrA=
lias,
+                                  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;
@@ -453,12 +534,14 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
     ret =3D 0;
=20
  cleanup:
-    virJSONValueFree(secobjProps);
+    virJSONValueFree(prmgrProps);
     virJSONValueFree(encobjProps);
+    virJSONValueFree(secobjProps);
     qemuDomainSecretDiskDestroy(disk);
-    VIR_FREE(devstr);
-    VIR_FREE(drivestr);
+    VIR_FREE(prmgrAlias);
     VIR_FREE(drivealias);
+    VIR_FREE(drivestr);
+    VIR_FREE(devstr);
     virObjectUnref(cfg);
     return ret;
=20
@@ -472,6 +555,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, prmgrAlias));
     if (qemuDomainObjExitMonitor(driver, vm) < 0)
         ret =3D -2;
     virErrorRestore(&orig_err);
@@ -481,6 +566,8 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
  error:
     qemuDomainDelDiskSrcTLSObject(driver, vm, disk->src);
     ignore_value(qemuHotplugPrepareDiskAccess(driver, vm, disk, NULL, true=
));
+    if (prdStarted)
+        qemuProcessKillPRDaemon(vm);
     goto cleanup;
 }
=20
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 36cfa438ed..b0c22001d1 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2565,7 +2565,7 @@ qemuProcessBuildPRHelperPidfilePath(virDomainObjPtr v=
m,
 }
=20
=20
-static void
+void
 qemuProcessKillPRDaemon(virDomainObjPtr vm)
 {
     qemuDomainObjPrivatePtr priv =3D vm->privateData;
@@ -2629,7 +2629,7 @@ qemuProcessStartPRDaemonHook(void *opaque)
 }
=20
=20
-static int
+int
 qemuProcessStartPRDaemon(virDomainObjPtr vm,
                          const virDomainDiskDef *disk)
 {
diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 3bf66f71b7..eda6695415 100644
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -205,4 +205,9 @@ int qemuProcessRefreshDisks(virQEMUDriverPtr driver,
                             virDomainObjPtr vm,
                             qemuDomainAsyncJob asyncJob);
=20
+int qemuProcessStartPRDaemon(virDomainObjPtr vm,
+                             const virDomainDiskDef *disk);
+
+void qemuProcessKillPRDaemon(virDomainObjPtr vm);
+
 #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 Thu May  2 20:23:22 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 1524489327817898.0683716339988;
 Mon, 23 Apr 2018 06:15:27 -0700 (PDT)
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 271223130D64;
	Mon, 23 Apr 2018 13:15: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 A7DC018A49;
	Mon, 23 Apr 2018 13:15:25 +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 20D0C65D15;
	Mon, 23 Apr 2018 13:15:25 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDF4Ii022135 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:15:04 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 3ABD7215CDCB; Mon, 23 Apr 2018 13:15:04 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 7C6D2215CDCC;
	Mon, 23 Apr 2018 13:15:03 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:45 +0200
Message-Id: 
 <8ba60cbea099ee4dc027ba7ae5f2a73bb76ee1b4.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 10/11] 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.43]);
 Mon, 23 Apr 2018 13:15:26 +0000 (UTC)
X-ZohoMail: RSF_0  Z_629925259 SPT_0
Content-Type: text/plain; charset="utf-8"

If we are the last one to use pr-manager object we need to remove
it and also kill the qemu-pr-helper process.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/qemu/qemu_hotplug.c | 56 +++++++++++++++++++++++++++++++++++++++++++++=
++++
 1 file changed, 56 insertions(+)

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 2e736873d1..e9dd8a4532 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -3824,6 +3824,49 @@ static bool qemuIsMultiFunctionDevice(virDomainDefPt=
r def,
 }
=20
=20
+static int
+qemuDomainDiskNeedRemovePR(virDomainObjPtr vm,
+                           virDomainDiskDefPtr disk,
+                           char **aliasret,
+                           bool *stopDaemon)
+{
+    qemuDomainObjPrivatePtr priv =3D vm->privateData;
+    size_t i;
+
+    *aliasret =3D NULL;
+    *stopDaemon =3D false;
+
+    if (!virStoragePRDefIsEnabled(disk->src->pr))
+        return 0;
+
+    if (!virStoragePRDefIsManaged(disk->src->pr)) {
+        *aliasret =3D qemuDomainGetUnmanagedPRAlias(disk);
+        return *aliasret ? 0 : -1;
+    }
+
+    for (i =3D 0; i < vm->def->ndisks; i++) {
+        const virDomainDiskDef *domainDisk =3D vm->def->disks[i];
+
+        if (domainDisk =3D=3D disk)
+            continue;
+
+        if (virStoragePRDefIsManaged(domainDisk->src->pr))
+            break;
+    }
+
+    if (i !=3D vm->def->ndisks)
+        return 0;
+
+    if (VIR_STRDUP(*aliasret, qemuDomainGetManagedPRAlias()) < 0)
+        return -1;
+
+    if (priv->prDaemonRunning)
+        *stopDaemon =3D true;
+
+    return 0;
+}
+
+
 static int
 qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
                            virDomainObjPtr vm,
@@ -3837,6 +3880,8 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
     char *drivestr;
     char *objAlias =3D NULL;
     char *encAlias =3D NULL;
+    char *prmgrAlias =3D NULL;
+    bool stopPRDaemon =3D false;
=20
     VIR_DEBUG("Removing disk %s from domain %p %s",
               disk->info.alias, vm, vm->def->name);
@@ -3874,6 +3919,9 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
         }
     }
=20
+    if (qemuDomainDiskNeedRemovePR(vm, disk, &prmgrAlias, &stopPRDaemon) <=
 0)
+        return -1;
+
     qemuDomainObjEnterMonitor(driver, vm);
=20
     qemuMonitorDriveDel(priv->mon, drivestr);
@@ -3889,6 +3937,11 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
         ignore_value(qemuMonitorDelObject(priv->mon, encAlias));
     VIR_FREE(encAlias);
=20
+    /* If it fails, then so be it - it was a best shot */
+    if (prmgrAlias)
+        ignore_value(qemuMonitorDelObject(priv->mon, prmgrAlias));
+    VIR_FREE(prmgrAlias);
+
     if (disk->src->haveTLS)
         ignore_value(qemuMonitorDelObject(priv->mon, disk->src->tlsAlias));
=20
@@ -3907,6 +3960,9 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
         }
     }
=20
+    if (stopPRDaemon)
+        qemuProcessKillPRDaemon(vm);
+
     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 Thu May  2 20:23:22 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 1524489328008932.6716803330672;
 Mon, 23 Apr 2018 06:15:28 -0700 (PDT)
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 A1A2B2B0A8C;
	Mon, 23 Apr 2018 13:15:26 +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 5B2966FEF4;
	Mon, 23 Apr 2018 13:15:26 +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 EE3F11853E26;
	Mon, 23 Apr 2018 13:15:25 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com
	[10.11.54.6])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id w3NDF5wV022148 for <libvir-list@listman.util.phx.redhat.com>;
	Mon, 23 Apr 2018 09:15:05 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 1B0822166BAD; Mon, 23 Apr 2018 13:15:05 +0000 (UTC)
Received: from moe.brq.redhat.com (unknown [10.43.2.192])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 767402166BC6;
	Mon, 23 Apr 2018 13:15:04 +0000 (UTC)
From: Michal Privoznik <mprivozn@redhat.com>
To: libvir-list@redhat.com
Date: Mon, 23 Apr 2018 15:14:46 +0200
Message-Id: 
 <1887de9d8ae507d8c9011a86fb4ed1b01c479b38.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
In-Reply-To: <cover.1524489077.git.mprivozn@redhat.com>
References: <cover.1524489077.git.mprivozn@redhat.com>
X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6
X-loop: libvir-list@redhat.com
Cc: pkrempa@redhat.com
Subject: [libvirt] [PATCH v5 11/11] 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.12
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]);
 Mon, 23 Apr 2018 13:15:27 +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>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---
 src/qemu/qemu_capabilities.c                       | 1 +
 tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 +
 tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   | 1 +
 tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d67b859d75..dea41dfbd0 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1100,6 +1100,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[=
] =3D {
     { "virtio-mouse-ccw", QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW },
     { "virtio-tablet-ccw", QEMU_CAPS_DEVICE_VIRTIO_TABLET_CCW },
     { "pcie-pci-bridge", QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE },
+    { "pr-manager-helper", QEMU_CAPS_PR_MANAGER_HELPER },
 };
=20
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[]=
 =3D {
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemuc=
apabilitiesdata/caps_2.11.0.s390x.xml
index 6dd392502e..70fd047fa8 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -118,6 +118,7 @@
   <flag name=3D'qcow2-luks'/>
   <flag name=3D'seccomp-blacklist'/>
   <flag name=3D'disk-write-cache'/>
+  <flag name=3D'pr-manager-helper'/>
   <version>2011000</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>342058</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qem=
ucapabilitiesdata/caps_2.12.0.aarch64.xml
index 31c5d0dd23..fbfb41f354 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -157,6 +157,7 @@
   <flag name=3D'seccomp-blacklist'/>
   <flag name=3D'query-cpus-fast'/>
   <flag name=3D'disk-write-cache'/>
+  <flag name=3D'pr-manager-helper'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>342346</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemuc=
apabilitiesdata/caps_2.12.0.ppc64.xml
index 7dead4a1f4..d8975299e4 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -154,6 +154,7 @@
   <flag name=3D'seccomp-blacklist'/>
   <flag name=3D'query-cpus-fast'/>
   <flag name=3D'disk-write-cache'/>
+  <flag name=3D'pr-manager-helper'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>419215</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemuc=
apabilitiesdata/caps_2.12.0.s390x.xml
index 70ae8f91c7..1c93993920 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -119,6 +119,7 @@
   <flag name=3D'seccomp-blacklist'/>
   <flag name=3D'query-cpus-fast'/>
   <flag name=3D'disk-write-cache'/>
+  <flag name=3D'pr-manager-helper'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>0</microcodeVersion>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemu=
capabilitiesdata/caps_2.12.0.x86_64.xml
index d809a78380..adb751f596 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -195,6 +195,7 @@
   <flag name=3D'seccomp-blacklist'/>
   <flag name=3D'query-cpus-fast'/>
   <flag name=3D'disk-write-cache'/>
+  <flag name=3D'pr-manager-helper'/>
   <version>2011090</version>
   <kvmVersion>0</kvmVersion>
   <microcodeVersion>390060</microcodeVersion>
--=20
2.16.1

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