[libvirt] [PATCH 12/13] util: storage: Store PR manager alias in the definition
Rather than always re-generating the alias store it in the definition
and in the status XML.
Signed-off-by: Peter Krempa
---
src/qemu/qemu_command.c | 23 +++--
src/qemu/qemu_command.h | 3 +--
src/qemu/qemu_domain.c| 16 +--
src/qemu/qemu_hotplug.c | 34 ++-
src/util/virstoragefile.c | 1 +
src/util/virstoragefile.h | 3 +++
tests/qemustatusxml2xmldata/modern-in.xml | 4
7 files changed, 37 insertions(+), 47 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index c38dde5a60..84d7d51c7c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9669,7 +9669,6 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
* qemuBuildPRManagerInfoProps:
* @disk: disk definition
* @propsret: Returns JSON object containing properties of the
pr-manager-helper object
- * @aliasret: alias of the pr-manager-helper object
*
* Build the JSON properties for the pr-manager object.
*
@@ -9678,32 +9677,19 @@ qemuBuildPanicCommandLine(virCommandPtr cmd,
*/
int
qemuBuildPRManagerInfoProps(const virDomainDiskDef *disk,
-virJSONValuePtr *propsret,
-char **aliasret)
+virJSONValuePtr *propsret)
{
-char *alias = NULL;
int ret = -1;
*propsret = NULL;
-*aliasret = NULL;
-
-if (virStoragePRDefIsManaged(disk->src->pr)) {
-if (VIR_STRDUP(alias, qemuDomainGetManagedPRAlias()) < 0)
-goto cleanup;
-} else {
-if (!(alias = qemuDomainGetUnmanagedPRAlias(disk->info.alias)))
-goto cleanup;
-}
if (virJSONValueObjectCreate(propsret,
"s:path", disk->src->pr->path,
NULL) < 0)
goto cleanup;
-VIR_STEAL_PTR(*aliasret, alias);
ret = 0;
cleanup:
-VIR_FREE(alias);
return ret;
}
@@ -9715,7 +9701,6 @@ qemuBuildMasterPRCommandLine(virCommandPtr cmd,
size_t i;
bool managedAdded = false;
virJSONValuePtr props = NULL;
-char *alias = NULL;
char *tmp = NULL;
int ret = -1;
@@ -9732,14 +9717,13 @@ qemuBuildMasterPRCommandLine(virCommandPtr cmd,
managedAdded = true;
}
-if (qemuBuildPRManagerInfoProps(disk, &props, &alias) < 0)
+if (qemuBuildPRManagerInfoProps(disk, &props) < 0)
goto cleanup;
if (!(tmp = virQEMUBuildObjectCommandlineFromJSON("pr-manager-helper",
- alias,
+
disk->src->pr->mgralias,
props)))
goto cleanup;
-VIR_FREE(alias);
virJSONValueFree(props);
props = NULL;
@@ -9749,7 +9733,6 @@ qemuBuildMasterPRCommandLine(virCommandPtr cmd,
ret = 0;
cleanup:
-VIR_FREE(alias);
virJSONValueFree(props);
return ret;
}
diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
index 621592cd79..28bc33558b 100644
--- a/src/qemu/qemu_command.h
+++ b/src/qemu/qemu_command.h
@@ -56,8 +56,7 @@ virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver,
/* Generate the object properties for pr-manager */
int qemuBuildPRManagerInfoProps(const virDomainDiskDef *disk,
-virJSONValuePtr *propsret,
-char **alias);
+virJSONValuePtr *propsret);
/* 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 92217e66fe..1572ce5c2d 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -1941,6 +1941,9 @@ qemuStorageSourcePrivateDataParse(xmlXPathContextPtr ctxt,
src->nodestorage =
virXPathString("string(./nodenames/nodename[@type='storage']/@name)", ctxt);
src->nodeformat =
virXPathString("string(./nodenames/nodename[@type='format']/@name)", ctxt);
+if (src->pr)
+src->pr->mgralias = virXPathString("string(./reservations/@mgralias)",
ctxt);
+
if (virStorageSourcePrivateDataParseRelPath(ctxt, src) < 0)
return -1;
@@ -1961,6 +1964,9 @@ qemuStorageSourcePrivateDataFormat(virStorageSourcePtr
src,
virBufferAddLit(buf, "\n");
}
+if (src->pr)
+virBufferAsprintf(buf, "\n",
src->pr->mgralias);
+
if (virStorageSourcePrivateDataFormatRelPath(src, buf) < 0)
return -1;
@@ -11932,7 +11938,8 @@ qemuDomainPrepareDiskCachemode(virDomainDiskDefPtr disk)
static int
qemuDomainPrepareStorageSourcePR(virStorageSourcePtr src,
- qemuDomainObjPrivatePtr priv)
+ qemuDomainObjPrivatePtr priv,
+ const cha
Re: [libvirt] [PATCH 12/13] util: storage: Store PR manager alias in the definition
On 05/14/2018 12:45 PM, Peter Krempa wrote: > Rather than always re-generating the alias store it in the definition > and in the status XML. > > Signed-off-by: Peter Krempa > --- > src/qemu/qemu_command.c | 23 +++-- > src/qemu/qemu_command.h | 3 +-- > src/qemu/qemu_domain.c| 16 +-- > src/qemu/qemu_hotplug.c | 34 > ++- > src/util/virstoragefile.c | 1 + > src/util/virstoragefile.h | 3 +++ > tests/qemustatusxml2xmldata/modern-in.xml | 4 > 7 files changed, 37 insertions(+), 47 deletions(-) Yes, this makes sense to me. I've kept alias in status XML for all the versions until the very last one. You have my ACK, but since John was opposed maybe we should ask for his opinion too (so that we don't go behind his back). Michal -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 12/13] util: storage: Store PR manager alias in the definition
On 05/14/2018 11:19 AM, Michal Privoznik wrote: > On 05/14/2018 12:45 PM, Peter Krempa wrote: >> Rather than always re-generating the alias store it in the definition >> and in the status XML. >> >> Signed-off-by: Peter Krempa >> --- >> src/qemu/qemu_command.c | 23 +++-- >> src/qemu/qemu_command.h | 3 +-- >> src/qemu/qemu_domain.c| 16 +-- >> src/qemu/qemu_hotplug.c | 34 >> ++- >> src/util/virstoragefile.c | 1 + >> src/util/virstoragefile.h | 3 +++ >> tests/qemustatusxml2xmldata/modern-in.xml | 4 >> 7 files changed, 37 insertions(+), 47 deletions(-) > > Yes, this makes sense to me. I've kept alias in status XML for all the > versions until the very last one. You have my ACK, but since John was > opposed maybe we should ask for his opinion too (so that we don't go > behind his back). > I still see no purpose for an alias to be saved since it's static, but I seem to be alone in that thinking. Just as much as I was alone in the thinking that qemuDomainGetManagedPRAlias is unnecessary and that a constant static string would work just the same. I'm also not convinced that a non managed system should be supported, but I recall Michal noting something during one of the reviews that it was useful for some future work. Shouldn't at the very least the formatting of the path and alias only occur for !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)... Would mean passing @flags to virStoragePRDefFormat. At the very least it'll make it obvious about it's only being formatted for the active/status guest. John -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 12/13] util: storage: Store PR manager alias in the definition
On Mon, May 14, 2018 at 18:03:00 -0400, John Ferlan wrote: > > > On 05/14/2018 11:19 AM, Michal Privoznik wrote: > > On 05/14/2018 12:45 PM, Peter Krempa wrote: > >> Rather than always re-generating the alias store it in the definition > >> and in the status XML. > >> > >> Signed-off-by: Peter Krempa > >> --- > >> src/qemu/qemu_command.c | 23 +++-- > >> src/qemu/qemu_command.h | 3 +-- > >> src/qemu/qemu_domain.c| 16 +-- > >> src/qemu/qemu_hotplug.c | 34 > >> ++- > >> src/util/virstoragefile.c | 1 + > >> src/util/virstoragefile.h | 3 +++ > >> tests/qemustatusxml2xmldata/modern-in.xml | 4 > >> 7 files changed, 37 insertions(+), 47 deletions(-) > > > > Yes, this makes sense to me. I've kept alias in status XML for all the > > versions until the very last one. You have my ACK, but since John was > > opposed maybe we should ask for his opinion too (so that we don't go > > behind his back). > > > > I still see no purpose for an alias to be saved since it's static, but I > seem to be alone in that thinking. Just as much as I was alone in the > thinking that qemuDomainGetManagedPRAlias is unnecessary and that a > constant static string would work just the same. I'm also not convinced > that a non managed system should be supported, but I recall Michal > noting something during one of the reviews that it was useful for some > future work. The point of storing the aliases in the XML is that it records the state as we've used when we've created the object in qemu. If we will need to change the naming scheme for some reason we'd require to add a lot of code which will use the old/new alias depending on which would be originally used. By storing it into the status XML you are relieved of all this by just using what was used before. The future work referenced by Michal is the blockdev work, where the hot-remove code paths for disks will need to use the correct alias for the individual layer of the backing chain rather than the disk. I'll need to tweak this for the Authentication/encryption/TLS secrets as well, since they can't all share the same alias even when they correspond to the same disk. > Shouldn't at the very least the formatting of the path and alias only > occur for !(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)... Would mean > passing @flags to virStoragePRDefFormat. At the very least it'll make > it obvious about it's only being formatted for the active/status guest. The alias is formatted in the section of the virStorageSource which is only formatted when the XML is active. That is handled by the global storage source private data formatter. signature.asc Description: PGP signature -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list
