{"id":1954399,"url":"http://patchwork.ozlabs.org/api/patches/1954399/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1719776434-435013-4-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-4-git-send-email-steven.sistare@oracle.com>","list_archive_url":null,"date":"2024-06-30T19:40:26","name":"[V2,03/11] migration: save cpr mode","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"c837844ee2864fb303417c63003210563b03f71c","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-4-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/1954399/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1954399/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=h/5wp/zJ;\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 4WC01B1fJQz1xpW\n\tfor ; Mon, 1 Jul 2024 05:41:49 +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 1sO0Pw-0008T7-S9; Sun, 30 Jun 2024 15:40:56 -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 1sO0Pp-0008R1-RD\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:49 -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 1sO0Pn-0004O9-KJ\n for qemu-devel@nongnu.org; Sun, 30 Jun 2024 15:40:49 -0400","from pps.filterd (m0333521.ppops.net [127.0.0.1])\n by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id\n 45UIuFOu001690;\n Sun, 30 Jun 2024 19:40:42 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 40296asg9n-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:42 +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 45UIwiMH018459; Sun, 30 Jun 2024 19:40:40 GMT","from pps.reinject (localhost [127.0.0.1])\n by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id\n 4028qc16d9-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);\n Sun, 30 Jun 2024 19:40:40 +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 45UJeaSU014044;\n Sun, 30 Jun 2024 19:40:40 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-4; Sun, 30 Jun 2024 19:40:40 +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=n4MgAr16sdNb4ng3UGdhpWQ4/HtGee3oPi/m+dImwfc=; b=\n h/5wp/zJGkemQXwtQdDuJktV/BOjkyxdW82U3N8cgW65nBHZCqXAeP1sBfpwcfBX\n f3d4eaXb97n/vH+vRbo7Ei4hWL9oxfbssbuDx9290wAXLGNnnKVpnWNoqAtBrAiX\n iIBbpLQ4GwbrFouwINfRTkbmCKBn8PiKFe0YRmCB+0lCA2oEh75NNRTKwh3fs8LB\n wo4H/0w1FDi1jeFvq3HecYSrWxjSNcJeDVK7KIYhQujL3JEZnbuG/hhuPxTlq+Iz\n iKzw39auTGEocvaQrIkDa2uGoNrgHHgzfW9yy/iy+rJ6L3LlSzOP6YwW5bDTWzKn\n zcFU7U8zb5FmUhsMiykH3A==","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 03/11] migration: save cpr mode","Date":"Sun, 30 Jun 2024 12:40:26 -0700","Message-Id":"<1719776434-435013-4-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":"3rqkujtzAlanIjf-eP2bWH66TW-GJ6T2","X-Proofpoint-ORIG-GUID":"3rqkujtzAlanIjf-eP2bWH66TW-GJ6T2","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":"Save the mode in CPR state, so the user does not need to explicitly specify\nit for the target. Modify migrate_mode() so it returns the incoming mode on\nthe target.\n\nSigned-off-by: Steve Sistare \n---\n include/migration/cpr.h | 7 +++++++\n migration/cpr.c | 23 ++++++++++++++++++++++-\n migration/migration.c | 1 +\n migration/options.c | 9 +++++++--\n 4 files changed, 37 insertions(+), 3 deletions(-)","diff":"diff --git a/include/migration/cpr.h b/include/migration/cpr.h\nindex 8e7e705..42b4019 100644\n--- a/include/migration/cpr.h\n+++ b/include/migration/cpr.h\n@@ -8,6 +8,13 @@\n #ifndef MIGRATION_CPR_H\n #define MIGRATION_CPR_H\n \n+#include \"qapi/qapi-types-migration.h\"\n+\n+#define MIG_MODE_NONE MIG_MODE__MAX\n+\n+MigMode cpr_get_incoming_mode(void);\n+void cpr_set_incoming_mode(MigMode mode);\n+\n typedef int (*cpr_walk_fd_cb)(int fd);\n void cpr_save_fd(const char *name, int id, int fd);\n void cpr_delete_fd(const char *name, int id);\ndiff --git a/migration/cpr.c b/migration/cpr.c\nindex 313e74e..1c296c6 100644\n--- a/migration/cpr.c\n+++ b/migration/cpr.c\n@@ -21,10 +21,23 @@\n typedef QLIST_HEAD(CprFdList, CprFd) CprFdList;\n \n typedef struct CprState {\n+ MigMode mode;\n CprFdList fds;\n } CprState;\n \n-static CprState cpr_state;\n+static CprState cpr_state = {\n+ .mode = MIG_MODE_NONE,\n+};\n+\n+MigMode cpr_get_incoming_mode(void)\n+{\n+ return cpr_state.mode;\n+}\n+\n+void cpr_set_incoming_mode(MigMode mode)\n+{\n+ cpr_state.mode = mode;\n+}\n \n /****************************************************************************/\n \n@@ -124,11 +137,19 @@ void cpr_resave_fd(const char *name, int id, int fd)\n /*************************************************************************/\n #define CPR_STATE \"CprState\"\n \n+static int cpr_state_presave(void *opaque)\n+{\n+ cpr_state.mode = migrate_mode();\n+ return 0;\n+}\n+\n static const VMStateDescription vmstate_cpr_state = {\n .name = CPR_STATE,\n .version_id = 1,\n .minimum_version_id = 1,\n+ .pre_save = cpr_state_presave,\n .fields = (VMStateField[]) {\n+ VMSTATE_UINT32(mode, CprState),\n VMSTATE_QLIST_V(fds, CprState, 1, vmstate_cpr_fd, CprFd, next),\n VMSTATE_END_OF_LIST()\n }\ndiff --git a/migration/migration.c b/migration/migration.c\nindex e394ad7..0f47765 100644\n--- a/migration/migration.c\n+++ b/migration/migration.c\n@@ -411,6 +411,7 @@ void migration_incoming_state_destroy(void)\n mis->postcopy_qemufile_dst = NULL;\n }\n \n+ cpr_set_incoming_mode(MIG_MODE_NONE);\n yank_unregister_instance(MIGRATION_YANK_INSTANCE);\n }\n \ndiff --git a/migration/options.c b/migration/options.c\nindex 645f550..305397a 100644\n--- a/migration/options.c\n+++ b/migration/options.c\n@@ -22,6 +22,7 @@\n #include \"qapi/qmp/qnull.h\"\n #include \"sysemu/runstate.h\"\n #include \"migration/colo.h\"\n+#include \"migration/cpr.h\"\n #include \"migration/misc.h\"\n #include \"migration.h\"\n #include \"migration-stats.h\"\n@@ -758,8 +759,12 @@ uint64_t migrate_max_postcopy_bandwidth(void)\n \n MigMode migrate_mode(void)\n {\n- MigrationState *s = migrate_get_current();\n- MigMode mode = s->parameters.mode;\n+ MigMode mode = cpr_get_incoming_mode();\n+\n+ if (mode == MIG_MODE_NONE) {\n+ MigrationState *s = migrate_get_current();\n+ mode = s->parameters.mode;\n+ }\n \n assert(mode >= 0 && mode < MIG_MODE__MAX);\n return mode;\n","prefixes":["V2","03/11"]}