External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: domain: Change 'Id' to 'ID' in qemuDomainStorageIdNew/Reset

Browse Source 
In a patch adding similarly named APIs I was asked to use 'ID' instead
of 'Id'. Since the code is being put together fix
qemuDomainStorageIdNew/Reset first.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-02-14 10:56:41 +01:00
parent 9693b06630
commit 4d8cb61e4d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_domain.c
View File

@ -657,27 +657,27 @@ qemuDomainMasterKeyCreate(virDomainObj *vm)
/**
* qemuDomainStorageIdNew:
* qemuDomainStorageIDNew:
* @priv: qemu VM private data object.
*
* Generate a new unique id for a storage object. Useful for node name generation.
*/
static unsigned int
qemuDomainStorageIdNew(qemuDomainObjPrivate *priv)
qemuDomainStorageIDNew(qemuDomainObjPrivate *priv)
{
return ++priv->nodenameindex;
}
/**
* qemuDomainStorageIdReset:
* qemuDomainStorageIDReset:
* @priv: qemu VM private data object.
*
* Resets the data for the node name generator. The node names need to be unique
* for a single instance, so can be reset on VM shutdown.
*/
static void
qemuDomainStorageIdReset(qemuDomainObjPrivate *priv)
qemuDomainStorageIDReset(qemuDomainObjPrivate *priv)
{
priv->nodenameindex = 0;
}
@ -1681,7 +1681,7 @@ qemuDomainObjPrivateDataClear(qemuDomainObjPrivate *priv)
g_clear_pointer(&priv->backup, virDomainBackupDefFree);
/* reset node name allocator */
qemuDomainStorageIdReset(priv);
qemuDomainStorageIDReset(priv);
priv->dbusDaemonRunning = false;
@ -3090,7 +3090,7 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt,
if (qemuDomainObjPrivateXMLParseBackups(priv, ctxt) < 0)
goto error;
qemuDomainStorageIdReset(priv);
qemuDomainStorageIDReset(priv);
if (virXPathULongLong("string(./nodename/@index)", ctxt,
&priv->nodenameindex) == -2) {
virReportError(VIR_ERR_XML_ERROR, "%s",
@ -10646,7 +10646,7 @@ qemuDomainPrepareStorageSourceBlockdev(virDomainDiskDef *disk,
qemuDomainObjPrivate *priv,
virQEMUDriverConfig *cfg)
{
src->id = qemuDomainStorageIdNew(priv);
src->id = qemuDomainStorageIDNew(priv);
src->nodestorage = g_strdup_printf("libvirt-%u-storage", src->id);
src->nodeformat = g_strdup_printf("libvirt-%u-format", src->id);
@ -10773,7 +10773,7 @@ qemuDomainPrepareHostdev(virDomainHostdevDef *hostdev,
src->readonly = hostdev->readonly;
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI)) {
src->id = qemuDomainStorageIdNew(priv);
src->id = qemuDomainStorageIDNew(priv);
src->nodestorage = g_strdup_printf("libvirt-%d-backend", src->id);
backendalias = src->nodestorage;
}