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

qemuDomainDetermineDiskChain: Remove 'report_broken' argument

Browse Source 
All callers pass 'true'.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2022-07-22 11:47:36 +02:00
parent 5eb283e294
commit 942da2d661
5 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/qemu/qemu_domain.c
View File

@ -7532,19 +7532,16 @@ qemuDomainPrepareStorageSourceConfig(virStorageSource *src,
* @vm: domain object
* @disk: disk definition
* @disksrc: source to determine the chain for, may be NULL
* @report_broken: report broken chain verbosely
*
* Prepares and initializes the backing chain of disk @disk. In cases where
* a new source is to be associated with @disk the @disksrc parameter can be
* used to override the source. If @report_broken is true missing images
* in the backing chain are reported.
* used to override the source.
*/
int
qemuDomainDetermineDiskChain(virQEMUDriver *driver,
virDomainObj *vm,
virDomainDiskDef *disk,
virStorageSource *disksrc,
bool report_broken)
virStorageSource *disksrc)
{
g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
virStorageSource *src; /* iterator for the backing chain declared in XML */
@ -7566,8 +7563,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
disksrc->format < VIR_STORAGE_FILE_BACKING) {
if (!virFileExists(disksrc->path)) {
if (report_broken)
virStorageSourceReportBrokenChain(errno, disksrc, disksrc);
virStorageSourceReportBrokenChain(errno, disksrc, disksrc);
return -1;
}
@ -7590,24 +7586,22 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
src = disksrc;
/* skip to the end of the chain if there is any */
while (virStorageSourceHasBacking(src)) {
if (report_broken) {
int rv = virStorageSourceSupportsAccess(src);
int rv = virStorageSourceSupportsAccess(src);
if (rv < 0)
if (rv < 0)
return -1;
if (rv > 0) {
if (qemuDomainStorageFileInit(driver, vm, src, disksrc) < 0)
return -1;
if (rv > 0) {
if (qemuDomainStorageFileInit(driver, vm, src, disksrc) < 0)
return -1;
if (virStorageSourceAccess(src, F_OK) < 0) {
virStorageSourceReportBrokenChain(errno, src, disksrc);
virStorageSourceDeinit(src);
return -1;
}
if (virStorageSourceAccess(src, F_OK) < 0) {
virStorageSourceReportBrokenChain(errno, src, disksrc);
virStorageSourceDeinit(src);
return -1;
}
virStorageSourceDeinit(src);
}
src = src->backingStore;
}
@ -7625,7 +7619,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
if (virStorageSourceGetMetadata(src, uid, gid,
QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_DEPTH,
report_broken) < 0)
true) < 0)
return -1;
for (n = src->backingStore; virStorageSourceIsBacking(n); n = n->backingStore) {

3
src/qemu/qemu_domain.h
View File

@ -708,8 +708,7 @@ int qemuDomainStorageSourceValidateDepth(virStorageSource *src,
int qemuDomainDetermineDiskChain(virQEMUDriver *driver,
virDomainObj *vm,
virDomainDiskDef *disk,
virStorageSource *disksrc,
bool report_broken);
virStorageSource *disksrc);
bool qemuDomainDiskChangeSupported(virDomainDiskDef *disk,
virDomainDiskDef *orig_disk);

2
src/qemu/qemu_driver.c
View File

@ -15084,7 +15084,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm,
if (mirror_reuse &&
mirror->format >= VIR_STORAGE_FILE_BACKING &&
mirror->backingStore == NULL &&
qemuDomainDetermineDiskChain(driver, vm, disk, mirror, true) < 0)
qemuDomainDetermineDiskChain(driver, vm, disk, mirror) < 0)
goto endjob;
if (qemuDomainStorageSourceChainAccessAllow(driver, vm, mirror) < 0)

4
src/qemu/qemu_hotplug.c
View File

@ -571,7 +571,7 @@ qemuDomainChangeEjectableMedia(virQEMUDriver *driver,
if (virDomainDiskTranslateSourcePool(disk) < 0)
goto cleanup;
if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) < 0)
if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0)
goto cleanup;
if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0)
@ -902,7 +902,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *driver,
if (virDomainDiskTranslateSourcePool(disk) < 0)
goto cleanup;
if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) < 0)
if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) < 0)
goto cleanup;
for (i = 0; i < vm->def->ndisks; i++) {

2
src/qemu/qemu_process.c
View File

@ -6774,7 +6774,7 @@ qemuProcessPrepareHostStorage(virQEMUDriver *driver,
if (qemuDomainDiskIsMissingLocalOptional(disk) && cold_boot)
VIR_INFO("optional disk '%s' source file is missing, "
"skip checking disk chain", disk->dst);
else if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true) >= 0)
else if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) >= 0)
continue;
if (qemuDomainCheckDiskStartupPolicy(driver, vm, idx, cold_boot) >= 0)