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: Convert disk backend setup code to use 'format' nodename accessors

Browse Source 
The disk backend setup code is concerned only about the effective
nodename. Doing this conversion will also simplify further changes
needed to drop the 'raw' layer in cases when it's not really needed.

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 16:09:55 +02:00
parent d63221a889
commit 6eb41dff95
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qemu/qemu_block.c
View File

@ -1980,7 +1980,7 @@ qemuBlockStorageGetCopyOnReadProps(virDomainDiskDef *disk)
ignore_value(virJSONValueObjectAdd(&ret,
"s:driver", "copy-on-read",
"s:node-name", priv->nodeCopyOnRead,
"s:file", disk->src->nodeformat,
"s:file", qemuBlockStorageSourceGetEffectiveNodename(disk->src),
"s:discard", "unmap",
NULL));
@ -2735,10 +2735,10 @@ qemuBlockStorageSourceCreateDetectSize(GHashTable *blockNamedNodeData,
{
qemuBlockNamedNodeData *entry;
if (!(entry = virHashLookup(blockNamedNodeData, templ->nodeformat))) {
if (!(entry = virHashLookup(blockNamedNodeData, qemuBlockStorageSourceGetEffectiveNodename(templ)))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("failed to update capacity data for block node '%1$s'"),
templ->nodeformat);
qemuBlockStorageSourceGetEffectiveNodename(templ));
return -1;
}

2
src/qemu/qemu_domain.c
View File

@ -7891,7 +7891,7 @@ qemuDomainDiskGetTopNodename(virDomainDiskDef *disk)
if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON)
return priv->nodeCopyOnRead;
return disk->src->nodeformat;
return qemuBlockStorageSourceGetEffectiveNodename(disk->src);
}