From nobody Sun Feb 8 07:58:50 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.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.129.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=1662036602; cv=none; d=zohomail.com; s=zohoarc; b=Bln5XejnWJXElrrWA6bS6X0NPk0jhBS88NWM0zLBlzGisjQNNPDmoMFH+WPY5/58zVEohg9ju8W/Lh4JgH4Xtx+7f5p4y+31aKJkxb1CQd1NvCeD2oKyUwbNjh7XILqgSrnrFGcke84QbIT6O2Gl8R1xjSwM5EMDxAee2A2J+08= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662036602; 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=REyJcmOOk8wmaDps8gmIVas8HUCZ91A56Tz9c2P/QGU=; b=UFelLTP3l3eskrCt0SKhG5aI5FeL4im5Yl2+4OdCcjHMczMTQyVGT6xTTCkXKGflWtyqivranrbjv6Xb5dPEFaX7ctDInlLrrzDYA5l3FiQQdiG+/z2dC9Bkit6ZREDLix/9Ay/Tu8zRumH0Lthc4QBdHPlkciLrE3fZ1S2tXUo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.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.129.124]) by mx.zohomail.com with SMTPS id 1662036602755655.7257319725575; Thu, 1 Sep 2022 05:50:02 -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-467-xEZTQ_TiOViQTlucWCPGXg-1; Thu, 01 Sep 2022 08:49:56 -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 D2F913800C38; Thu, 1 Sep 2022 12:49:53 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 87EE6C15BB3; Thu, 1 Sep 2022 12:49:53 +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 4305C1943214; Thu, 1 Sep 2022 12:49:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D68FD194322D for ; Thu, 1 Sep 2022 12:47:44 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id C2BE6403350; Thu, 1 Sep 2022 12:47:44 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.227]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 84753403373 for ; Thu, 1 Sep 2022 12:47:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 5F91C240A7B; Thu, 1 Sep 2022 14:47:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662036600; 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=REyJcmOOk8wmaDps8gmIVas8HUCZ91A56Tz9c2P/QGU=; b=MwE2ebE7yku9AGGs3IATeWSEsA1GCc9DhgtyiB9aKuf2byxb06KmGJ/i+DNDIPx+QLFqEq 1ZqCAwwkKHd5yggM0/XGohhwA+BkPUiDfa2IytZTFrbH33Uvc8EWnMSVFZeGgBY1Gehju7 5v4kEFPoz+6q/8+0dl3ksQxsxqtH56M= X-MC-Unique: xEZTQ_TiOViQTlucWCPGXg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 2/3] qemu: Create wrapper for qemuMonitorMigrateCancel Date: Thu, 1 Sep 2022 14:47:40 +0200 Message-Id: <8ac22e2ae546b4cbbe7764e7b2ffecb33138e056.1662036411.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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 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: 1662036604770100001 Content-Type: text/plain; charset="utf-8" We will need a little bit more code around qemuMonitorMigrateCancel to make sure it works as expected. The new qemuMigrationSrcCancel helper will avoid repeating the code in several places. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 9 +-------- src/qemu/qemu_migration.c | 37 +++++++++++++++++++++++-------------- src/qemu/qemu_migration.h | 4 ++++ src/qemu/qemu_process.c | 5 +---- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 707f4cc1bb..a86efc769a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12808,17 +12808,10 @@ qemuDomainGetJobStats(virDomainPtr dom, static int qemuDomainAbortJobMigration(virDomainObj *vm) { - qemuDomainObjPrivate *priv =3D vm->privateData; - int ret; - VIR_DEBUG("Cancelling migration job at client request"); =20 qemuDomainObjAbortAsyncJob(vm); - qemuDomainObjEnterMonitor(vm); - ret =3D qemuMonitorMigrateCancel(priv->mon); - qemuDomainObjExitMonitor(vm); - - return ret; + return qemuMigrationSrcCancel(vm, VIR_ASYNC_JOB_NONE); } =20 =20 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 67d83ca743..5845dfdb9c 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4611,6 +4611,24 @@ qemuMigrationSrcStart(virDomainObj *vm, } =20 =20 +int +qemuMigrationSrcCancel(virDomainObj *vm, + virDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivate *priv =3D vm->privateData; + + VIR_DEBUG("Cancelling outgoing migration of domain %s", vm->def->name); + + if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) + return -1; + + qemuMonitorMigrateCancel(priv->mon); + qemuDomainObjExitMonitor(vm); + + return 0; +} + + static int qemuMigrationSrcRun(virQEMUDriver *driver, virDomainObj *vm, @@ -4952,11 +4970,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver, } =20 if (cancel && - priv->job.current->status !=3D VIR_DOMAIN_JOB_STATUS_HYPERVISO= R_COMPLETED && - qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_MIGRATION_OUT= ) =3D=3D 0) { - qemuMonitorMigrateCancel(priv->mon); - qemuDomainObjExitMonitor(vm); - } + priv->job.current->status !=3D VIR_DOMAIN_JOB_STATUS_HYPERVISO= R_COMPLETED) + qemuMigrationSrcCancel(vm, VIR_ASYNC_JOB_MIGRATION_OUT); =20 /* cancel any outstanding NBD jobs */ if (mig && mig->nbd) @@ -6900,11 +6915,8 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDom= ainObj *vm, if (rc =3D=3D -2) { virErrorPreserveLast(&orig_err); virCommandAbort(compressor); - if (virDomainObjIsActive(vm) && - qemuDomainObjEnterMonitorAsync(vm, asyncJob) =3D=3D 0) { - qemuMonitorMigrateCancel(priv->mon); - qemuDomainObjExitMonitor(vm); - } + if (virDomainObjIsActive(vm)) + qemuMigrationSrcCancel(vm, asyncJob); } goto cleanup; } @@ -6945,16 +6957,13 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDo= mainObj *vm, int qemuMigrationSrcCancelUnattended(virDomainObj *vm) { - qemuDomainObjPrivate *priv =3D vm->privateData; bool storage =3D false; size_t i; =20 VIR_DEBUG("Canceling unfinished outgoing migration of domain %s", vm->def->name); =20 - qemuDomainObjEnterMonitor(vm); - ignore_value(qemuMonitorMigrateCancel(priv->mon)); - qemuDomainObjExitMonitor(vm); + qemuMigrationSrcCancel(vm, VIR_ASYNC_JOB_NONE); =20 for (i =3D 0; i < vm->def->ndisks; i++) { virDomainDiskDef *disk =3D vm->def->disks[i]; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index bbc71d118d..31a5547399 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -243,6 +243,10 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, int qemuMigrationSrcCancelUnattended(virDomainObj *vm); =20 +int +qemuMigrationSrcCancel(virDomainObj *vm, + virDomainAsyncJob asyncJob); + int qemuMigrationAnyFetchStats(virDomainObj *vm, virDomainAsyncJob asyncJob, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 4e8daf83fe..4465fa89e9 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3674,7 +3674,6 @@ qemuProcessRecoverJob(virQEMUDriver *driver, virDomainJobObj *job, unsigned int *stopFlags) { - qemuDomainObjPrivate *priv =3D vm->privateData; virDomainState state; int reason; =20 @@ -3697,9 +3696,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver, case VIR_ASYNC_JOB_SAVE: case VIR_ASYNC_JOB_DUMP: case VIR_ASYNC_JOB_SNAPSHOT: - qemuDomainObjEnterMonitor(vm); - ignore_value(qemuMonitorMigrateCancel(priv->mon)); - qemuDomainObjExitMonitor(vm); + qemuMigrationSrcCancel(vm, VIR_ASYNC_JOB_NONE); /* resume the domain but only if it was paused as a result of * running a migration-to-file operation. Although we are * recovering an async job, this function is run at startup --=20 2.37.2