From nobody Fri Oct 18 08:43:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 171829173254175.16471608005577; Thu, 13 Jun 2024 08:15:32 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8740F11B0; Thu, 13 Jun 2024 11:15:31 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7B31C1254; Thu, 13 Jun 2024 11:12:23 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1A3A41171; Thu, 13 Jun 2024 11:12:18 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 85FCFC61 for ; Thu, 13 Jun 2024 11:12:01 -0400 (EDT) Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-159-xhMpMLU5NgWcQJbuXwyStA-1; Thu, 13 Jun 2024 11:11:59 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 02E821955DC1 for ; Thu, 13 Jun 2024 15:11:59 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.20]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1DC851956050 for ; Thu, 13 Jun 2024 15:11:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: *** X-Spam-Status: No, score=3.0 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,RCVD_IN_SBL_CSS,SPF_HELO_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718291521; h=from:from: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; bh=73D0v9uMI8KkCano6+2gfsrcIJryPljxXkUoLKtWKGk=; b=V0i8SgXMbhoNtgc5Hr6OxcrV4//hKm5l0EAO43ielvtOkbI9fxWGiGok0AvOBgxlxS4IM8 XNgMefdMi7bNMuyTRdDVlDNR0TkCv+N6E94/stHERn1MEC0g6+BAKUk7mYT31uRwJ9STVT 1qopkDnqRRY/fERUNVpvVqEpo08FzA8= X-MC-Unique: xhMpMLU5NgWcQJbuXwyStA-1 From: Peter Krempa To: devel@lists.libvirt.org Subject: [PATCH 10/12] qemu: migration: Inline 'qemuMigrationDstFinishResume()' Date: Thu, 13 Jun 2024 17:11:42 +0200 Message-ID: <072932d76fab387eb605356afd87c92780d25eab.1718291410.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: AO6JI2L74RRKG6T5RK3I4HGXGWTATSVV X-Message-ID-Hash: AO6JI2L74RRKG6T5RK3I4HGXGWTATSVV X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1718291734540100001 Content-Type: text/plain; charset="utf-8" The function is a pointless wrapper on top of qemuMigrationDstWaitForCompletion. Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 0d8d3fd94f..3524915e9d 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2098,7 +2098,7 @@ qemuMigrationDstWaitForCompletion(virDomainObj *vm, unsigned int flags =3D 0; int rv; - VIR_DEBUG("Waiting for incoming migration to complete"); + VIR_DEBUG("Waiting for incoming migration to complete (vm=3D'%p')", vm= ); if (postcopy) flags =3D QEMU_MIGRATION_COMPLETED_POSTCOPY; @@ -6689,21 +6689,6 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, } -static int -qemuMigrationDstFinishResume(virDomainObj *vm) -{ - VIR_DEBUG("vm=3D%p", vm); - - if (qemuMigrationDstWaitForCompletion(vm, - VIR_ASYNC_JOB_MIGRATION_IN, - false) < 0) { - return -1; - } - - return 0; -} - - static virDomainPtr qemuMigrationDstFinishActive(virQEMUDriver *driver, virConnectPtr dconn, @@ -6753,7 +6738,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, } if (flags & VIR_MIGRATE_POSTCOPY_RESUME) { - rc =3D qemuMigrationDstFinishResume(vm); + rc =3D qemuMigrationDstWaitForCompletion(vm, VIR_ASYNC_JOB_MIGRATI= ON_IN, false); inPostCopy =3D true; } else { rc =3D qemuMigrationDstFinishFresh(driver, vm, mig, flags, v3proto, --=20 2.45.2