{"id":1954401,"url":"http://patchwork.ozlabs.org/api/patches/1954401/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1719776434-435013-5-git-send-email-steven.sistare@oracle.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1719776434-435013-5-git-send-email-steven.sistare@oracle.com>","list_archive_url":null,"date":"2024-06-30T19:40:27","name":"[V2,04/11] migration: stop vm earlier for cpr","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fa005e92ece6aafac4e856385962504791f0cb8c","submitter":{"id":71906,"url":"http://patchwork.ozlabs.org/api/people/71906/?format=json","name":"Steve Sistare","email":"steven.sistare@oracle.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1719776434-435013-5-git-send-email-steven.sistare@oracle.com/mbox/","series":[{"id":413181,"url":"http://patchwork.ozlabs.org/api/series/413181/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=413181","date":"2024-06-30T19:40:26","name":"Live update: cpr-exec","version":2,"mbox":"http://patchwork.ozlabs.org/series/413181/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1954401/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1954401/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=oracle.com header.i=@oracle.com header.a=rsa-sha256\n header.s=corp-2023-11-20 header.b=ElT7uQzt;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4WC01B0B5Gz1xpN\n\tfor ; Mon, 1 Jul 2024 05:41:48 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1sO0Pz-00005g-CD; Sun, 30 Jun 2024 15:40:59 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1sO0Pu-0008SD-Ev\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:54 -0400","from mx0a-00069f02.pphosted.com ([205.220.165.32])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1sO0Po-0004OD-3s\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:50 -0400","from pps.filterd (m0246617.ppops.net [127.0.0.1])\n by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id\n 45UJaJeC017664;\n Sun, 30 Jun 2024 19:40:43 GMT","from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com\n (iadpaimrmta02.appoci.oracle.com [147.154.18.20])\n by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 402att9e1w-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:43 +0000 (GMT)","from pps.filterd\n (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19)\n with ESMTP id 45UIF7Pd018995; Sun, 30 Jun 2024 19:40:41 GMT","from pps.reinject (localhost [127.0.0.1])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id\n 4028qc16de-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:41 +0000","from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com\n (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1])\n by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 45UJeaSW014044;\n Sun, 30 Jun 2024 19:40:41 GMT","from ca-dev63.us.oracle.com (ca-dev63.us.oracle.com [10.211.8.221])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with\n ESMTP id 4028qc16cc-5; Sun, 30 Jun 2024 19:40:41 +0000"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=\n from:to:cc:subject:date:message-id:in-reply-to:references; s=\n corp-2023-11-20; bh=YMzHOnPI4SJdDNBTFEQliIPT3ScsAM18YJJIq7Tjh00=; b=\n ElT7uQztWXxHez8ZaMIP929QloRKHJPST6zCN9a5pukfEMJwamxanSFPyY7TEM12\n YBDzl+WARLzh0pXSMzBAtns8EByPc+uTGoWpRQtdGkxtUCSN0en86ZvUEMy0BvtB\n 6se2hvFI1qR5F2npHs7SJz9DSmdUMJlE+YrB13p19izm8NmyfCx+ZWazAJYhIAMi\n S9+KjI39sN24tV+jxGXBqiexW9cAep2b0L8fF2YzMEFV0l4T67X8KbWEgz+X+J67\n T6ipp+4NrcQp8AkVNF1r81zMBHel5d9WKEObjEWwZIor3cqEGk7H+uigJnmUhVLy\n Ma4AKbA043m9akUqCcgj9Q==","From":"Steve Sistare ","To":"qemu-devel@nongnu.org","Cc":"Peter Xu , Fabiano Rosas ,\n David Hildenbrand ,\n Marcel Apfelbaum ,\n Eduardo Habkost ,\n Philippe Mathieu-Daude ,\n Paolo Bonzini ,\n \"Daniel P. Berrange\" ,\n Markus Armbruster ,\n Steve Sistare ","Subject":"[PATCH V2 04/11] migration: stop vm earlier for cpr","Date":"Sun, 30 Jun 2024 12:40:27 -0700","Message-Id":"<1719776434-435013-5-git-send-email-steven.sistare@oracle.com>","X-Mailer":"git-send-email 1.8.3.1","In-Reply-To":"<1719776434-435013-1-git-send-email-steven.sistare@oracle.com>","References":"<1719776434-435013-1-git-send-email-steven.sistare@oracle.com>","X-Proofpoint-Virus-Version":"vendor=baseguard\n engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16\n definitions=2024-06-30_16,2024-06-28_01,2024-05-17_01","X-Proofpoint-Spam-Details":"rule=notspam policy=default score=0 suspectscore=0\n malwarescore=0\n adultscore=0 bulkscore=0 mlxlogscore=999 phishscore=0 spamscore=0\n mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1\n engine=8.12.0-2406180000 definitions=main-2406300157","X-Proofpoint-GUID":"qF5bfRn0hc62MZWOB_mm7YLhsdzvD6lP","X-Proofpoint-ORIG-GUID":"qF5bfRn0hc62MZWOB_mm7YLhsdzvD6lP","Received-SPF":"pass client-ip=205.220.165.32;\n envelope-from=steven.sistare@oracle.com; helo=mx0a-00069f02.pphosted.com","X-Spam_score_int":"-20","X-Spam_score":"-2.1","X-Spam_bar":"--","X-Spam_report":"(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001,\n SPF_PASS=-0.001 autolearn=ham autolearn_force=no","X-Spam_action":"no action","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Stop the vm earlier for cpr, to guarantee consistent device state when\nCPR state is saved.\n\nSigned-off-by: Steve Sistare \n---\n migration/migration.c | 22 +++++++++++++---------\n 1 file changed, 13 insertions(+), 9 deletions(-)","diff":"diff --git a/migration/migration.c b/migration/migration.c\nindex 0f47765..8a8e927 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -2077,6 +2077,7 @@ void qmp_migrate(const char *uri, bool has_channels,\n MigrationState *s = migrate_get_current();\n g_autoptr(MigrationChannel) channel = NULL;\n MigrationAddress *addr = NULL;\n+ bool stopped = false;\n \n /*\n * Having preliminary checks for uri and channel\n@@ -2120,6 +2121,15 @@ void qmp_migrate(const char *uri, bool has_channels,\n }\n }\n \n+ if (migrate_mode_is_cpr(s)) {\n+ int ret = migration_stop_vm(s, RUN_STATE_FINISH_MIGRATE);\n+ if (ret < 0) {\n+ error_setg(&local_err, \"migration_stop_vm failed, error %d\", -ret);\n+ goto out;\n+ }\n+ stopped = true;\n+ }\n+\n if (cpr_state_save(&local_err)) {\n goto out;\n }\n@@ -2155,6 +2165,9 @@ out:\n }\n migrate_fd_error(s, local_err);\n error_propagate(errp, local_err);\n+ if (stopped && runstate_is_live(s->vm_old_state)) {\n+ vm_start();\n+ }\n return;\n }\n }\n@@ -3738,7 +3751,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)\n Error *local_err = NULL;\n uint64_t rate_limit;\n bool resume = (s->state == MIGRATION_STATUS_POSTCOPY_RECOVER_SETUP);\n- int ret;\n \n /*\n * If there's a previous error, free it and prepare for another one.\n@@ -3810,14 +3822,6 @@ void migrate_fd_connect(MigrationState *s, Error *error_in)\n return;\n }\n \n- if (migrate_mode_is_cpr(s)) {\n- ret = migration_stop_vm(s, RUN_STATE_FINISH_MIGRATE);\n- if (ret < 0) {\n- error_setg(&local_err, \"migration_stop_vm failed, error %d\", -ret);\n- goto fail;\n- }\n- }\n-\n if (migrate_background_snapshot()) {\n qemu_thread_create(&s->thread, \"mig/snapshot\",\n bg_migration_thread, s, QEMU_THREAD_JOINABLE);\n","prefixes":["V2","04/11"]}