From nobody Sun Feb 8 13:10: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=1652196250; cv=none; d=zohomail.com; s=zohoarc; b=hXoLpns1oj02u4yYhl+8xRrToyRJV68/Qhdhv5thKymxtQ4aIHKWzQF1gTVT+IFwVJxTl2WZ4RNy6g2FsK5e2RehGYGNNlIMcxNWFRPBahCZJpkFSx6pasxAkgCIH2zRkRd6Z0elAKMysfDMquyL45+JCt5OXTv/PC0H2V1WdZk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652196250; 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=yzCvWWvnWctUYWqaCiuMP+U4GR2MjxEli7GeA3K8/78=; b=W7e9gSqnd+OaafDePQvwCB4fKYK7O6cW9dmMRbtypAm9JB2SaEfGdyqyK3SSfWjflne7AZtS7KumPxloB8f+OTXYwQ8AtZd0bWZChCIvAj3LwSW0jq/VbrMR8S78TBUgyO0gd30qzG22zbdtoV2gcoiVJ5q8QJ5E1D6bBribVCw= 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 1652196250854983.6216421821204; Tue, 10 May 2022 08:24:10 -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-562-7HzjDwtWMryj_BJtPx0Q-Q-1; Tue, 10 May 2022 11:23:21 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 50352857D00; Tue, 10 May 2022 15:22:14 +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 3C9E415088B0; Tue, 10 May 2022 15:22:14 +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 F23481949762; Tue, 10 May 2022 15:22:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 66B4819451EC for ; Tue, 10 May 2022 15:21:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4EE6BC27EB1; Tue, 10 May 2022 15:21:50 +0000 (UTC) Received: from virval.usersys.redhat.com (unknown [10.43.2.187]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2F8F3C27DB5 for ; Tue, 10 May 2022 15:21:50 +0000 (UTC) Received: by virval.usersys.redhat.com (Postfix, from userid 500) id BB96B244625; Tue, 10 May 2022 17:21:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652196249; 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=yzCvWWvnWctUYWqaCiuMP+U4GR2MjxEli7GeA3K8/78=; b=GropBjIgS+E8Eb5HO2HD+nrzP2lRvx47nYuOQGIXBGamJGNZv7tx4OxQ2CZ1lQ76GB62S5 dcrfPaoUAbXmAVUbmvQn1qgwvdjVA8kAj0expOdKyMpl9bvGdUBYcerwoIXKmj68C1eUcn C49l8+pxNnwlwJQedO8jPhulQCqThRU= X-MC-Unique: 7HzjDwtWMryj_BJtPx0Q-Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Jiri Denemark To: libvir-list@redhat.com Subject: [libvirt PATCH 57/80] qemu: Add support for 'resume' parameter of migrate QMP command Date: Tue, 10 May 2022 17:21:18 +0200 Message-Id: <534a2419101403d89ecfb511c1a4ba97971cf7e2.1652196064.git.jdenemar@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 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.7 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: 1652196251085100002 Content-Type: text/plain; charset="utf-8" Signed-off-by: Jiri Denemark Reviewed-by: Peter Krempa --- src/qemu/qemu_migration.c | 8 ++++++-- src/qemu/qemu_monitor.h | 1 + src/qemu/qemu_monitor_json.c | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index e1c67c51ec..30c8dbd954 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4433,8 +4433,12 @@ qemuMigrationSrcStart(virQEMUDriver *driver, } =20 /* log start of migration */ - if ((timestamp =3D virTimeStringNow()) !=3D NULL) - qemuDomainLogAppendMessage(driver, vm, "%s: initiating migration\n= ", timestamp); + if ((timestamp =3D virTimeStringNow()) !=3D NULL) { + if (migrateFlags & QEMU_MONITOR_MIGRATE_RESUME) + qemuDomainLogAppendMessage(driver, vm, "%s: resuming migration= \n", timestamp); + else + qemuDomainLogAppendMessage(driver, vm, "%s: initiating migrati= on\n", timestamp); + } =20 switch (spec->destType) { case MIGRATION_DEST_HOST: diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 5949e21a39..38b65eb950 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -907,6 +907,7 @@ typedef enum { QEMU_MONITOR_MIGRATE_BACKGROUND =3D 1 << 0, QEMU_MONITOR_MIGRATE_NON_SHARED_DISK =3D 1 << 1, /* migration with non-= shared storage with full disk copy */ QEMU_MONITOR_MIGRATE_NON_SHARED_INC =3D 1 << 2, /* migration with non-= shared storage with incremental copy */ + QEMU_MONITOR_MIGRATE_RESUME =3D 1 << 3, /* resume failed post-= copy migration */ QEMU_MONITOR_MIGRATION_FLAGS_LAST } QEMU_MONITOR_MIGRATE; =20 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index df3fdfe4fb..ea2e001483 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -3419,10 +3419,12 @@ int qemuMonitorJSONMigrate(qemuMonitor *mon, bool detach =3D !!(flags & QEMU_MONITOR_MIGRATE_BACKGROUND); bool blk =3D !!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_DISK); bool inc =3D !!(flags & QEMU_MONITOR_MIGRATE_NON_SHARED_INC); + bool resume =3D !!(flags & QEMU_MONITOR_MIGRATE_RESUME); g_autoptr(virJSONValue) cmd =3D qemuMonitorJSONMakeCommand("migrate", "b:detach", d= etach, "b:blk", blk, "b:inc", inc, + "b:resume", r= esume, "s:uri", uri, NULL); g_autoptr(virJSONValue) reply =3D NULL; --=20 2.35.1