From nobody Sun Feb 8 07:52:24 2026 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=1662036609; cv=none; d=zohomail.com; s=zohoarc; b=gyOs9WTZEA0blexzIebJpxQCWKje3+kshBDEads7vE1TEraK861UVhZbp4nFHRlXOY7QYfVMznXU4U/Gw4NuyhCdtUWvOvrcLDEE4uo6AX0epCWJ3oe5v77zQ7oSMdYqm9fzzX0P962iBSwnpAh/n5WX267KRJ9OdOZYCjrxjv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662036609; 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=gH/q+1/RAQgxJij1hvsKp+6z8/dju58KXiSYZwNbfy4=; b=TEYzVKN6jXYhLIiRn/jG7CFzoomzdrfUUswwunUWmQQ0atv0YDyToo1Fs+kheRB4zUJHmFVBtmu23JPy4byW1EWglzfgyAjU3WIzgcgQreNgA2pUgh9qXWxXFzIXMuRukWas6ExYeM+1oAenmQMkyZ++tZNVVOqdCbDbYtp2Oxw= 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 1662036609271114.28923263139188; Thu, 1 Sep 2022 05:50:09 -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-587-hsBDSwh_Oeii63B5rAionA-1; Thu, 01 Sep 2022 08:49:56 -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 5AF1080D2A2; Thu, 1 Sep 2022 12:49:54 +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 47FD42026D4C; Thu, 1 Sep 2022 12:49:54 +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 8974A1940342; Thu, 1 Sep 2022 12:49:53 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 099251946A5E for ; Thu, 1 Sep 2022 12:47:45 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CB1BC20296CB; 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 9A0C420296B9 for ; Thu, 1 Sep 2022 12:47:44 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id 5E839240049; 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=1662036608; 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=gH/q+1/RAQgxJij1hvsKp+6z8/dju58KXiSYZwNbfy4=; b=MFdqA5y20E/9qs2EXdVjj5GOr9mmHzCkrRsQlofyd6itYDrbnnwyWmgzCh7xYEDQiS/KH3 CdS1p/gBiUZraaZZiVdwnqwFQaRVvrSWWmcFruT4OxuGqi8o0svXfxSKx/niv/nWzltD9/ rHfn6NE3m5ZlBbpD9nZqNeaalO40fgw= X-MC-Unique: hsBDSwh_Oeii63B5rAionA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 1/3] qemu: Rename qemuMigrationSrcCancel Date: Thu, 1 Sep 2022 14:47:39 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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 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: 1662036610812100001 Content-Type: text/plain; charset="utf-8" Let's call this qemuMigrationSrcCancelUnattended as the function is supposed to be used when no other thread is watching the migration. Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration.h | 2 +- src/qemu/qemu_process.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b3b25d78b4..67d83ca743 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6943,7 +6943,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, =20 =20 int -qemuMigrationSrcCancel(virDomainObj *vm) +qemuMigrationSrcCancelUnattended(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; bool storage =3D false; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index d518889c19..bbc71d118d 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -241,7 +241,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int -qemuMigrationSrcCancel(virDomainObj *vm); +qemuMigrationSrcCancelUnattended(virDomainObj *vm); =20 int qemuMigrationAnyFetchStats(virDomainObj *vm, diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 32f03ff79a..4e8daf83fe 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3537,7 +3537,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriver *driver, */ VIR_DEBUG("Cancelling unfinished migration of domain %s", vm->def->name); - if (qemuMigrationSrcCancel(vm) < 0) { + if (qemuMigrationSrcCancelUnattended(vm) < 0) { VIR_WARN("Could not cancel ongoing migration of domain %s", vm->def->name); } --=20 2.37.2