Re: [libvirt] [PATCH 10/14] qemu: Track PR daemons PIDs in status XML

[Peter Krempa]

On Thu, Jan 18, 2018 at 17:04:42 +0100, Michal Privoznik wrote:
> We need to keep track of spawned processes so that we can kill
> them when qemu process dies.
> 
> Signed-off-by: Michal Privoznik 
> ---
>  src/qemu/qemu_domain.c | 130 
> +
>  1 file changed, 130 insertions(+)
> 
> diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
> index 97996b053..4079165f9 100644
> --- a/src/qemu/qemu_domain.c
> +++ b/src/qemu/qemu_domain.c
> @@ -131,6 +131,10 @@ static virClassPtr qemuDomainSaveCookieClass;
>  static void qemuDomainLogContextDispose(void *obj);
>  static void qemuDomainSaveCookieDispose(void *obj);
>  
> +static void
> +qemuDomainDiskPRObjectHashFree(void *payload,
> +   const void *name);
> +
>  static int
>  qemuDomainOnceInit(void)
>  {
> @@ -1954,6 +1958,46 @@ qemuDomainObjPrivateXMLFormatAllowReboot(virBufferPtr 
> buf,
>  }
>  
>  
> +static int
> +qemuDomainObjPrivateXMLFormatOnePR(void *payload,
> +   const void *name,
> +   void *data)
> +{
> +qemuDomainDiskPRObjectPtr prObj = payload;
> +virBufferPtr buf = data;
> +
> +virBufferAddLit(buf, "\n");
> +virBufferAdjustIndent(buf, 2);
> +virBufferAsprintf(buf, "%s\n", (const char *) name);
> +virBufferAsprintf(buf, "%s\n",
> +  
> virTristateBoolTypeToString(virTristateBoolFromBool(prObj->managed)));
> +virBufferEscapeString(buf, "%s\n", prObj->path);
> +virBufferAsprintf(buf, "%lld\n", (long long) prObj->pid);

You don't really need any of this data for the unmanaged ones and need
the PID and path for the managed manager. So this will also need some
tweaking.



signature.asc
Description: PGP signature
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 10/14] qemu: Track PR daemons PIDs in status XML

[Michal Privoznik]

We need to keep track of spawned processes so that we can kill
them when qemu process dies.

Signed-off-by: Michal Privoznik 
---
 src/qemu/qemu_domain.c | 130 +
 1 file changed, 130 insertions(+)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 97996b053..4079165f9 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -131,6 +131,10 @@ static virClassPtr qemuDomainSaveCookieClass;
 static void qemuDomainLogContextDispose(void *obj);
 static void qemuDomainSaveCookieDispose(void *obj);
 
+static void
+qemuDomainDiskPRObjectHashFree(void *payload,
+   const void *name);
+
 static int
 qemuDomainOnceInit(void)
 {
@@ -1954,6 +1958,46 @@ qemuDomainObjPrivateXMLFormatAllowReboot(virBufferPtr 
buf,
 }
 
 
+static int
+qemuDomainObjPrivateXMLFormatOnePR(void *payload,
+   const void *name,
+   void *data)
+{
+qemuDomainDiskPRObjectPtr prObj = payload;
+virBufferPtr buf = data;
+
+virBufferAddLit(buf, "\n");
+virBufferAdjustIndent(buf, 2);
+virBufferAsprintf(buf, "%s\n", (const char *) name);
+virBufferAsprintf(buf, "%s\n",
+  
virTristateBoolTypeToString(virTristateBoolFromBool(prObj->managed)));
+virBufferEscapeString(buf, "%s\n", prObj->path);
+virBufferAsprintf(buf, "%lld\n", (long long) prObj->pid);
+virBufferAdjustIndent(buf, -2);
+virBufferAddLit(buf, "\n");
+
+return 0;
+}
+
+
+static void
+qemuDomainObjPrivateXMLFormatPRs(virBufferPtr buf,
+ virDomainObjPtr vm)
+{
+qemuDomainObjPrivatePtr priv = vm->privateData;
+
+if (!priv->prHelpers)
+return;
+
+virBufferAddLit(buf, "\n");
+virBufferAdjustIndent(buf, 2);
+virHashForEach(priv->prHelpers,
+   qemuDomainObjPrivateXMLFormatOnePR, buf);
+virBufferAdjustIndent(buf, -2);
+virBufferAddLit(buf, "\n");
+}
+
+
 static int
 qemuDomainObjPrivateXMLFormat(virBufferPtr buf,
   virDomainObjPtr vm)
@@ -2081,6 +2125,8 @@ qemuDomainObjPrivateXMLFormat(virBufferPtr buf,
 if (qemuDomainObjPrivateXMLFormatBlockjobs(buf, vm) < 0)
 return -1;
 
+qemuDomainObjPrivateXMLFormatPRs(buf, vm);
+
 return 0;
 }
 
@@ -2213,6 +2259,87 @@ 
qemuDomainObjPrivateXMLParseAllowReboot(xmlXPathContextPtr ctxt,
 }
 
 
+static qemuDomainDiskPRObjectPtr
+qemuDomainObjPrivateXMLParseOnePR(xmlXPathContextPtr ctxt,
+  char **alias)
+{
+qemuDomainDiskPRObjectPtr ret;
+char *managedStr = NULL;
+int managed;
+char *path = NULL;
+long long cpid;
+
+if (VIR_ALLOC(ret) < 0)
+return NULL;
+
+if (!(managedStr = virXPathString("string(./managed)", ctxt)) ||
+!(*alias = virXPathString("string(./alias)", ctxt)) ||
+!(path = virXPathString("string(./path)", ctxt)) ||
+virXPathLongLong("string(./pid)", ctxt, ) < 0 ||
+(managed = virTristateBoolTypeFromString(managedStr)) < 0) {
+virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+   _("Malformed status XML in "));
+goto error;
+}
+
+VIR_FREE(managedStr);
+ret->managed = managed == VIR_TRISTATE_BOOL_YES;
+ret->path = path;
+ret->pid = cpid;
+path = NULL;
+
+return ret;
+
+ error:
+VIR_FREE(managedStr);
+VIR_FREE(*alias);
+VIR_FREE(path);
+VIR_FREE(ret);
+return NULL;
+}
+
+
+static int
+qemuDomainObjPrivateXMLParsePRs(qemuDomainObjPrivatePtr priv,
+xmlXPathContextPtr ctxt)
+{
+xmlNodePtr saveNode = ctxt->node;
+xmlNodePtr *nodeset = NULL;
+virHashTablePtr prHelpers = NULL;
+size_t i, n;
+int ret = -1;
+
+if ((n = virXPathNodeSet("./prManagers/manager", ctxt, )) > 0) {
+if (!(prHelpers = virHashCreate(10, qemuDomainDiskPRObjectHashFree)))
+goto cleanup;
+
+for (i = 0; i < n; i++) {
+qemuDomainDiskPRObjectPtr tmp;
+char *alias = NULL;
+
+ctxt->node = nodeset[i];
+if (!(tmp = qemuDomainObjPrivateXMLParseOnePR(ctxt, )))
+goto cleanup;
+
+if (virHashAddEntry(prHelpers, alias, tmp) < 0) {
+qemuDomainDiskPRObjectHashFree(tmp, alias);
+VIR_FREE(alias);
+goto cleanup;
+}
+}
+}
+
+priv->prHelpers = prHelpers;
+prHelpers = NULL;
+ret = 0;
+ cleanup:
+virHashFree(prHelpers);
+VIR_FREE(nodeset);
+ctxt->node = saveNode;
+return ret;
+}
+
+
 static int
 qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
  virDomainObjPtr vm,
@@ -2433,6 +2560,9 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
 if (qemuDomainObjPrivateXMLParseBlockjobs(priv, ctxt) < 0)
 goto error;
 
+if (qemuDomainObjPrivateXMLParsePRs(priv,