From nobody Mon Dec 15 23:01:47 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=1658846339; cv=none; d=zohomail.com; s=zohoarc; b=QdZPNpSy+vQqo3gTAw0fcCrOdXU+8gBn0TWb/6h6Xk5TJUC6ltZurnGaen9iFkozKhSWNZhA5J2wejdcpcKMOxeE9c6JQfsKck1GwaNZeoSCXegIIoYc8IhRoM0YbC5rPVsLwH1N30yLrFmm70stsQLudIm6FW6Cpof6bQcaNqE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846339; 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=2/v+NfTByCko75MJOMZXzOY/ib5224+tH9OH2aNHSIc=; b=m7T1fPCT4NzKoQ6TTv02u8LKw85mkLSvhpuWsUMiArZWwvUGbPeFe2ZA2OF72iGcArS3+4ANWyXCjqtDWc8l+iE1lqN2KOdfh4NzxIokRjCRNf14fcp9XtztPIodduGXZZNohwHGaDlVfVjaEJeKLR3z31SCt3r9DU3kjmXzjqo= 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 1658846339078159.56317929636612; Tue, 26 Jul 2022 07:38:59 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-44-3G21PnxWM2OnSZXnrHoD6g-1; Tue, 26 Jul 2022 10:38:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 396FE823F0F; Tue, 26 Jul 2022 14:38:40 +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 24DF02026D64; Tue, 26 Jul 2022 14:38:40 +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 71AB01945DAA; Tue, 26 Jul 2022 14:38:39 +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 46F0D1945DA5 for ; Tue, 26 Jul 2022 14:38:32 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3752940149A6; Tue, 26 Jul 2022 14:38:32 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4082400DFD7 for ; Tue, 26 Jul 2022 14:38:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846338; 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=2/v+NfTByCko75MJOMZXzOY/ib5224+tH9OH2aNHSIc=; b=FW3PH+zyvAuMjDtvEjv6+s2bG00vywR4iXVZK6EwQOwrCdreBxXeL5onhhwvL9zVwk2vJG EH21IQCqNGu8uAep9guHjqFmFN28QTRvR9x0TN1sKbEYlIBKaMpI/ZtwLjg1QaIlQVKWKl sr5EBZBsE3nEbvG2j21pH1qH7ZpTJlY= X-MC-Unique: 3G21PnxWM2OnSZXnrHoD6g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 31/80] qemu: blockjob: Remove legacy block job completion code Date: Tue, 26 Jul 2022 16:37:09 +0200 Message-Id: <183415ee8fa261ada0b9dc30f59f51da5c15a1ea.1658843187.git.pkrempa@redhat.com> 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.4 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: 1658846340345100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_blockjob.c | 136 +-------------------------------------- 1 file changed, 1 insertion(+), 135 deletions(-) diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index ed82ac5dc2..304008a31a 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -703,137 +703,6 @@ qemuBlockJobRewriteConfigDiskSource(virDomainObj *vm, } -static void -qemuBlockJobEventProcessLegacyCompleted(virQEMUDriver *driver, - virDomainObj *vm, - qemuBlockJobData *job, - int asyncJob) -{ - virDomainDiskDef *disk =3D job->disk; - - if (!disk) - return; - - if (disk->mirrorState =3D=3D VIR_DOMAIN_DISK_MIRROR_STATE_PIVOT) { - qemuBlockJobRewriteConfigDiskSource(vm, disk, disk->mirror); - /* XXX We want to revoke security labels as well as audit that - * revocation, before dropping the original source. But it gets - * tricky if both source and mirror share common backing files (we - * want to only revoke the non-shared portion of the chain); so for - * now, we leak the access to the original. */ - virDomainLockImageDetach(driver->lockManager, vm, disk->src); - - /* Move secret driver metadata */ - if (qemuSecurityMoveImageMetadata(driver, vm, disk->src, disk->mir= ror) < 0) { - VIR_WARN("Unable to move disk metadata on " - "vm %s from %s to %s (disk target %s)", - vm->def->name, - NULLSTR(disk->src->path), - NULLSTR(disk->mirror->path), - disk->dst); - } - - virObjectUnref(disk->src); - disk->src =3D disk->mirror; - } else { - if (disk->mirror) { - virDomainLockImageDetach(driver->lockManager, vm, disk->mirror= ); - - /* Ideally, we would restore seclabels on the backing chain he= re - * but we don't know if somebody else is not using parts of it. - * Remove security driver metadata so that they are not leaked= . */ - qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirr= or); - - virObjectUnref(disk->mirror); - } - - qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src); - } - - /* Recompute the cached backing chain to match our - * updates. Better would be storing the chain ourselves - * rather than reprobing, but we haven't quite completed - * that conversion to use our XML tracking. */ - disk->mirror =3D NULL; - disk->mirrorState =3D VIR_DOMAIN_DISK_MIRROR_STATE_NONE; - disk->mirrorJob =3D VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; - disk->src->id =3D 0; - virStorageSourceBackingStoreClear(disk->src); - ignore_value(qemuDomainDetermineDiskChain(driver, vm, disk, NULL, true= )); - ignore_value(qemuBlockNodeNamesDetect(driver, vm, asyncJob)); - qemuBlockJobUnregister(job, vm); - qemuDomainSaveConfig(vm); -} - - -/** - * qemuBlockJobEventProcessLegacy: - * @driver: qemu driver - * @vm: domain - * @job: job to process events for - * - * Update disk's mirror state in response to a block job event - * from QEMU. For mirror state's that must survive libvirt - * restart, also update the domain's status XML. - */ -static void -qemuBlockJobEventProcessLegacy(virQEMUDriver *driver, - virDomainObj *vm, - qemuBlockJobData *job, - int asyncJob) -{ - virDomainDiskDef *disk =3D job->disk; - - VIR_DEBUG("disk=3D%s, mirrorState=3D%s, type=3D%d, state=3D%d, newstat= e=3D%d", - disk->dst, - NULLSTR(virDomainDiskMirrorStateTypeToString(disk->mirrorSta= te)), - job->type, - job->state, - job->newstate); - - if (job->newstate =3D=3D -1) - return; - - qemuBlockJobEmitEvents(driver, vm, disk, job->type, job->newstate); - - job->state =3D job->newstate; - job->newstate =3D -1; - - /* If we completed a block pull or commit, then update the XML - * to match. */ - switch ((virConnectDomainEventBlockJobStatus) job->state) { - case VIR_DOMAIN_BLOCK_JOB_COMPLETED: - qemuBlockJobEventProcessLegacyCompleted(driver, vm, job, asyncJob); - break; - - case VIR_DOMAIN_BLOCK_JOB_READY: - disk->mirrorState =3D VIR_DOMAIN_DISK_MIRROR_STATE_READY; - qemuDomainSaveStatus(vm); - break; - - case VIR_DOMAIN_BLOCK_JOB_FAILED: - case VIR_DOMAIN_BLOCK_JOB_CANCELED: - if (disk->mirror) { - virDomainLockImageDetach(driver->lockManager, vm, disk->mirror= ); - - /* Ideally, we would restore seclabels on the backing chain he= re - * but we don't know if somebody else is not using parts of it. - * Remove security driver metadata so that they are not leaked= . */ - qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirr= or); - - g_clear_pointer(&disk->mirror, virObjectUnref); - } - disk->mirrorState =3D VIR_DOMAIN_DISK_MIRROR_STATE_NONE; - disk->mirrorJob =3D VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; - qemuBlockJobUnregister(job, vm); - break; - - case VIR_DOMAIN_BLOCK_JOB_LAST: - break; - } -} - - static void qemuBlockJobEventProcessConcludedRemoveChain(virQEMUDriver *driver, virDomainObj *vm, @@ -1750,10 +1619,7 @@ qemuBlockJobUpdate(virDomainObj *vm, if (job->newstate =3D=3D -1) return; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) - qemuBlockJobEventProcess(priv->driver, vm, job, asyncJob); - else - qemuBlockJobEventProcessLegacy(priv->driver, vm, job, asyncJob); + qemuBlockJobEventProcess(priv->driver, vm, job, asyncJob); } --=20 2.36.1