External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-01 23:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: blockjob: Use 'format' nodename accessors for job naming

Browse Source 
Use the effective nodename for naming the job as we use that one now.
It doesn't matter too much which one we pick, because it's used just for
the name of the job, which we preserve in the status XML.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2023-10-16 15:41:12 +02:00
parent 47bd985ebb
commit 90fc8ef2a3
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_blockjob.c
View File

@ -252,7 +252,8 @@ qemuBlockJobDiskNewPull(virDomainObj *vm,
unsigned int jobflags)
{
g_autoptr(qemuBlockJobData) job = NULL;
g_autofree char *jobname = g_strdup_printf("pull-%s-%s", disk->dst, disk->src->nodeformat);
g_autofree char *jobname = g_strdup_printf("pull-%s-%s", disk->dst,
qemuBlockStorageSourceGetEffectiveNodename(disk->src));
if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_PULL, jobname)))
return NULL;
@ -278,7 +279,8 @@ qemuBlockJobDiskNewCommit(virDomainObj *vm,
unsigned int jobflags)
{
g_autoptr(qemuBlockJobData) job = NULL;
g_autofree char *jobname = g_strdup_printf("commit-%s-%s", disk->dst, top->nodeformat);
g_autofree char *jobname = g_strdup_printf("commit-%s-%s", disk->dst,
qemuBlockStorageSourceGetEffectiveNodename(top));
qemuBlockJobType jobtype = QEMU_BLOCKJOB_TYPE_COMMIT;
if (topparent == NULL)
@ -309,7 +311,7 @@ qemuBlockJobNewCreate(virDomainObj *vm,
{
g_autoptr(qemuBlockJobData) job = NULL;
g_autofree char *jobname = NULL;
const char *nodename = src->nodeformat;
const char *nodename = qemuBlockStorageSourceGetEffectiveNodename(src);
if (storage)
nodename = qemuBlockStorageSourceGetStorageNodename(src);
@ -340,7 +342,8 @@ qemuBlockJobDiskNewCopy(virDomainObj *vm,
unsigned int jobflags)
{
g_autoptr(qemuBlockJobData) job = NULL;
g_autofree char *jobname = g_strdup_printf("copy-%s-%s", disk->dst, disk->src->nodeformat);
g_autofree char *jobname = g_strdup_printf("copy-%s-%s", disk->dst,
qemuBlockStorageSourceGetEffectiveNodename(disk->src));
if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_COPY, jobname)))
return NULL;
@ -368,7 +371,8 @@ qemuBlockJobDiskNewBackup(virDomainObj *vm,
g_autoptr(qemuBlockJobData) job = NULL;
g_autofree char *jobname = NULL;
jobname = g_strdup_printf("backup-%s-%s", disk->dst, disk->src->nodeformat);
jobname = g_strdup_printf("backup-%s-%s", disk->dst,
qemuBlockStorageSourceGetEffectiveNodename(disk->src));
if (!(job = qemuBlockJobDataNew(QEMU_BLOCKJOB_TYPE_BACKUP, jobname)))
return NULL;