From nobody Mon Dec 15 23:05:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1658846468; cv=none; d=zohomail.com; s=zohoarc; b=UwsE/V1XxMjfnLzTfv6pdXplJa4vOEVYeVqH9EgmsbloDjytL6PUevc1zMbnciFaH43yeG5xt5ssQ3G2y4N1+ojFBD2KR2OSeU8W3OVU6qfGbpg7SrUwrCNuAUWx4UB3BgLOOeTDLQQIhtM/51WuGoQhT7hVfhOUkOc6y+Rzn8c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846468; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QJ+RYUNnrfaug7fhWfw9awwor5VbgzwFeljzU9LWyuE=; b=EGw5FNJnB1pGhbWfSSPdzqwGKHbzCbiGJLKMNpKfDUGpl3q2N3pqdMqY30sny6+iePN5vzROdOg0LQkHWmbzalrOm4eslwXr3tCg9ACoysAQsevcrBpbQxibOOy/0AeTrZjF3q0cBEt097EBt3IoRYVpycGZB959UmbL/oll9A8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1658846468497895.383173660487; Tue, 26 Jul 2022 07:41:08 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-549-5tQvBdQTO-iSP0DMlZ1ePQ-1; Tue, 26 Jul 2022 10:39:39 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 381F8381A08F; Tue, 26 Jul 2022 14:39:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 214E42166B2B; Tue, 26 Jul 2022 14:39:30 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B2D591940358; Tue, 26 Jul 2022 14:39:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 94E3F194036C for ; Tue, 26 Jul 2022 14:39:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 75CB340CF8EE; Tue, 26 Jul 2022 14:39:21 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id E974540149A6 for ; Tue, 26 Jul 2022 14:39:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846466; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QJ+RYUNnrfaug7fhWfw9awwor5VbgzwFeljzU9LWyuE=; b=ABA1YV6iKQmv6TCbIHndVUDMAn2+wmKAk/EvcEQ0P36k2HyKAi4AJKg+EdJyc6k9+1Wd+t pLuNd+JwocUMlfTZSArxhQgx0BKx6wT2J4BBz6Z08W+VdKd1k1qZmW16RmUaxXtFbbqg9+ DmrDAucgu5PApJAImSSNPG72oVYs8N0= X-MC-Unique: 5tQvBdQTO-iSP0DMlZ1ePQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 80/80] qemuDomainDetermineDiskChain: Remove 'report_broken' argument Date: Tue, 26 Jul 2022 16:37:58 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1658846470042100010 Content-Type: text/plain; charset="utf-8" All callers pass 'true'. Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_domain.c | 36 +++++++++++++++--------------------- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_process.c | 2 +- 5 files changed, 20 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d372381c74..e227a8b7d4 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -7617,19 +7617,16 @@ qemuDomainPrepareStorageSourceConfig(virStorageSour= ce *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 =3D virQEMUDriverGetConfig(driver); virStorageSource *src; /* iterator for the backing chain declared in X= ML */ @@ -7651,8 +7648,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; } @@ -7675,24 +7671,22 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver, src =3D disksrc; /* skip to the end of the chain if there is any */ while (virStorageSourceHasBacking(src)) { - if (report_broken) { - int rv =3D virStorageSourceSupportsAccess(src); + int rv =3D virStorageSourceSupportsAccess(src); - if (rv < 0) - return -1; - - if (rv > 0) { - if (qemuDomainStorageFileInit(driver, vm, src, disksrc) < = 0) - return -1; + if (rv < 0) + return -1; - if (virStorageSourceAccess(src, F_OK) < 0) { - virStorageSourceReportBrokenChain(errno, src, disksrc); - virStorageSourceDeinit(src); - 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; } + + virStorageSourceDeinit(src); } src =3D src->backingStore; } @@ -7710,7 +7704,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver, if (virStorageSourceGetMetadata(src, uid, gid, QEMU_DOMAIN_STORAGE_SOURCE_CHAIN_MAX_D= EPTH, - report_broken) < 0) + true) < 0) return -1; for (n =3D src->backingStore; virStorageSourceIsBacking(n); n =3D n->b= ackingStore) { diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index abf245ec2a..dcae0f9601 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -710,8 +710,7 @@ int qemuDomainStorageSourceValidateDepth(virStorageSour= ce *src, int qemuDomainDetermineDiskChain(virQEMUDriver *driver, virDomainObj *vm, virDomainDiskDef *disk, - virStorageSource *disksrc, - bool report_broken); + virStorageSource *disksrc); bool qemuDomainDiskChangeSupported(virDomainDiskDef *disk, virDomainDiskDef *orig_disk); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8c7cb64f98..49f694e0a7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15141,7 +15141,7 @@ qemuDomainBlockCopyCommon(virDomainObj *vm, if (mirror_reuse && mirror->format >=3D VIR_STORAGE_FILE_BACKING && mirror->backingStore =3D=3D NULL && - qemuDomainDetermineDiskChain(driver, vm, disk, mirror, true) < 0) + qemuDomainDetermineDiskChain(driver, vm, disk, mirror) < 0) goto endjob; if (qemuDomainStorageSourceChainAccessAllow(driver, vm, mirror) < 0) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index afc9d299f5..72e5b106e9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -576,7 +576,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) @@ -910,7 +910,7 @@ qemuDomainAttachDeviceDiskLiveInternal(virQEMUDriver *d= river, 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 =3D 0; i < vm->def->ndisks; i++) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f15222e932..a596ae8dec 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -6796,7 +6796,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= ) >=3D 0) + else if (qemuDomainDetermineDiskChain(driver, vm, disk, NULL) >=3D= 0) continue; if (qemuDomainCheckDiskStartupPolicy(driver, vm, idx, cold_boot) >= =3D 0) --=20 2.36.1