From nobody Thu Dec 18 03:20:20 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=1658846351; cv=none; d=zohomail.com; s=zohoarc; b=GECDTHunwmpeS6A2pLqfDG8lmqqexcDyh86LJLnzjFC/GVC1e2jRbcq1RIxCwRRMckKbSzFewqrIIR01psc67eENhNkNlmx2eqCmn1n1ixzE2HMkK+HqJb+RcHL8zL5ER+FUvLQ7p4eg4i4lYSeAGlsVe2X5nUbLCEtfdXRLME8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1658846351; 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=qqaOeE8JfbI9RL62SFfoC/sVD6y1dkWKVwfqbRGDh4s=; b=Vw2czT9/yO3jfNClDpIAa9ZPtbMTuj54W/jZkBWdK4dXCi8Wliqp24SUo+u1QdLyYSjFu+a01vRb6tAh4yIxIbNtmbv2SxjqYCaDYDCuXyFvlvojmhzDA7j471VjwmpKyCGUBVujsDSF8LbLz1QSQFJqXLiONktYsNMfHPPbN3g= 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 1658846351296113.34632938957145; Tue, 26 Jul 2022 07:39:11 -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-310-s0FVY6ddNj2T6J8SBnwrLw-1; Tue, 26 Jul 2022 10:39:05 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 663E28218F2; Tue, 26 Jul 2022 14:38:34 +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 51996C3598C; Tue, 26 Jul 2022 14:38:34 +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 A9ED61945DAA; Tue, 26 Jul 2022 14:38:33 +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 F1981194704C for ; Tue, 26 Jul 2022 14:38:29 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C30B940CFD0A; Tue, 26 Jul 2022 14:38:29 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 53773404C324 for ; Tue, 26 Jul 2022 14:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658846350; 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=qqaOeE8JfbI9RL62SFfoC/sVD6y1dkWKVwfqbRGDh4s=; b=O7XmOPhpBgoVqR2E+aH/+YVxljWcYEjFuVe4J0MStBxtiroUR3QUNRl7mxbRP7I+61dYwS F2BDhZXjb+Cy3wf2F8ARvqxCaAeiLEpWAiYdm0U/MarwIi9mo6WB6QwGlocUSdB/o+x+Rh sGxuxxZszW2G+PGfcJ9YDcGVH95nWAM= X-MC-Unique: s0FVY6ddNj2T6J8SBnwrLw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 28/80] qemu: migration_cookie: Remove pre-blockdev code paths Date: Tue, 26 Jul 2022 16:37:06 +0200 Message-Id: <5cb07666d8a9fdb86d7db8e6e9c0bfd476c19368.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.85 on 10.11.54.8 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: 1658846352315100006 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina --- src/qemu/qemu_migration_cookie.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 0738ad430f..88c147e9fa 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -479,7 +479,6 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, { qemuDomainObjPrivate *priv =3D vm->privateData; g_autoptr(GHashTable) stats =3D virHashNew(g_free); - bool blockdev =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); size_t i; int rc; @@ -499,11 +498,11 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, if (qemuDomainObjEnterMonitorAsync(driver, vm, priv->job.asyncJob) < 0) return -1; - if (blockdev) - rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stat= s); - else - rc =3D qemuMonitorBlockStatsUpdateCapacity(priv->mon, stats); + + rc =3D qemuMonitorBlockStatsUpdateCapacityBlockdev(priv->mon, stats); + qemuDomainObjExitMonitor(vm); + if (rc < 0) return -1; @@ -511,14 +510,8 @@ qemuMigrationCookieAddNBD(qemuMigrationCookie *mig, virDomainDiskDef *disk =3D vm->def->disks[i]; qemuBlockStats *entry; - if (blockdev) { - if (!(entry =3D virHashLookup(stats, disk->src->nodeformat))) - continue; - } else { - if (!disk->info.alias || - !(entry =3D virHashLookup(stats, disk->info.alias))) - continue; - } + if (!(entry =3D virHashLookup(stats, disk->src->nodeformat))) + continue; mig->nbd->disks[mig->nbd->ndisks].target =3D g_strdup(disk->dst); mig->nbd->disks[mig->nbd->ndisks].capacity =3D entry->capacity; --=20 2.36.1