From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from OSPPR02CU001.outbound.protection.outlook.com (mail-norwayeastazon11023106.outbound.protection.outlook.com [40.107.159.106]) by lore.virtuozzo.com (Postfix) with ESMTPS id D2E3E8106F for ; Fri, 30 Oct 2026 14:45:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uPtwY0/WohbnkgUb/iYMueQjzMMv5rU9KdlP5q/0qK6gTZXejygP6qZMkRwGKqq3OjPvN5ZHOzpiscGBKSL41dfsmpspH/T2GO3LMeenSiwJ60oRiXzR5UnayOQf1As2Rx+MUcF38DKTPrsym2Z7wIbFQ2mxcnZNQQSRFOSqzX9zUBx3PY39IrdpUxcUfxeDvQ1XDrAnT9ElvtP01yPRdbW1NMTR4uDStRhGqwLcb8vBZJMs6PglBdGfJ69p5xcNwCTok5mk4s7jQxgwz0UuoGGAw+TLX2faiiO5cJNv5Qeri7zGQaeWFdmAk47vssJ/HgafbYCL3hseyK3j76kl/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7B0h9gBbp+Z7ZBLs4uCpv1CnSHj+x294vfwWPn3A4cU=; b=WTHWGXOkAXNFc+PLcLjT9BNGV/lF7D/YbSVBI8cn5KTSS0VV2jaX3ne4OyRbs+ImCmJ7fpiVKqpiTgXRvSuhnox2Bn1wCBKrGC6PWS5GsLeayDCTt0icpqE5VfZzzkETHbao4D8ZKOPJOAQ6CjU56R0zxxFFU+diYHcpRl8QS5LFlSKWZYjLrGpxSrQldUQOx3gAcMPg9RwFhYfgd8T3tydsndOKexUnLMLKj+0Vqfv2JCSnz24MeeAiqZ5lglYnP10mjmiurJQBuaX6ymF8mwenuO4ruu39jAwKG04OTRydBnP2KsFqVPT+WuTHH9crJ2tdAVZBXsE85NpmA/vO5Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7B0h9gBbp+Z7ZBLs4uCpv1CnSHj+x294vfwWPn3A4cU=; b=Amn6scVyqSIYPSlF2IlEZFWzETL6HuEK0acPkL3BeDa1qWF72sgCuXS7CMzUso4uohuVN17v2DqXcI5Su62QhaaMffYfuWzhjVjIuPq7njvji717wdE1/0hsp9WF4JEElAstmwW9+hKKu4Rn2xX3/7nQuDeo8vNLpgH9zfeW4VZMADfhJqziHuvXGvNWbSf7qxfMzuqEZyrxtX3PuizIuL/EANM7x2rXweSgWZkHoYq9rgCIP+sQrtpeFzR/HIn6X3VrXqXXEMLskLEMGAT9Ix0w/foFm1sKy65TRFrZycfsMATj0/dUc2qEyfwIi4QTc6jZItrBAdBwzwoIGzUz6w== Authentication-Results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=virtuozzo.com; Received: from VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) by AS1PR08MB7451.eurprd08.prod.outlook.com (2603:10a6:20b:4dd::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.569.9; Fri, 30 Oct 2026 14:45:51 +0000 Received: from VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8]) by VI0PR08MB10656.eurprd08.prod.outlook.com ([fe80::4e37:b189:ddcd:3dd8%7]) with mapi id 15.21.0569.008; Fri, 30 Oct 2026 14:45:51 +0000 From: Andrey Drobyshev Date: Fri, 30 Oct 2026 16:45:51 +0200 Subject: [PATCH QEMU HCI-8.1 v6 20/34] migration: Move CPR HUP watch to cpr-transfer.c Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20261030-vfio_v1-v6-20-45de246bc92e@virtuozzo.com> References: <20261030-vfio_v1-v6-0-45de246bc92e@virtuozzo.com> In-Reply-To: <20261030-vfio_v1-v6-0-45de246bc92e@virtuozzo.com> To: svt-core@virtuozzo.com Cc: andrey.drobyshev@virtuozzo.com X-Mailer: b4 0.16.0 X-ClientProxiedBy: VI1PR0502CA0031.eurprd05.prod.outlook.com (2603:10a6:803:1::44) To VI0PR08MB10656.eurprd08.prod.outlook.com (2603:10a6:800:20a::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI0PR08MB10656:EE_|AS1PR08MB7451:EE_ X-MS-Office365-Filtering-Correlation-Id: 00b01869-eb0c-4bc7-119f-08df36947ca0 X-LD-Processed: 0bc7f26d-0264-416e-a6fc-8352af79c58f,ExtAddr List-Id: svt-core@virtuozzo.com X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|52116014|376014|23010399003|1800799024|5113699003|22082099003|18002099003|6133799003|3023799007|38350700014|56012099006|10067099003|261021123027099003|261028144727099003|261021121427099003|261022105027099003|261009223027099003|261026121527099003|261026140227099003; X-Microsoft-Antispam-Message-Info: VXRVpCSY1g1ytCrk54//d0kSo9Pbihh4mzaoy+mZ1yzwQtjGbhryTRKntaFKXyUOmcNwivIPNUusnOzZnFy8nhzrsjVJcem4NrcBn0Q+wu8jhDBBU+dNpZXYdVZIYLgjjvTZ/v2wz53Pdhkm7jjdaMYeQjXXCWySdA6VLumf+ivrVnxqTk9+G5nK5D0Iq4QQ/7jNLOQ2jUuglfrwt3SXvSap39TTEptyOyo0/8vY9tutTl5lBFApIPllZUho/lsAcR9XC6apj9rGFM5SkvHQ5TmnKBinmX1ZfDET6FxXtGMOea5gJ6bfbESLXlvVAWnx1gkwdHrF5pxoDH5j3t16lmyaDU0wpvDSWZNnuoLwcxNliKMiBeew2kKi3/C05WzsfK0Wsb2af2QTjMVeX02rBqz0BRc6Z/vNbiG9ux8x/oMAyZ9Q6WkV5mvcQwWiPrWl7MTYmHr0guVvY/a5Rl86etJpaxDQyq9KSWef65PPF0++QhJbMj0rjM+imvfkmBLW8xpb4MBAX1Ew3di5vEMD736W2z+5NaE8LWwCAW9t1AkaUN0t6kQ0CTWxrFK0jrSHx4d6gsdwNW54vfzPq7Llr6Ina+iUibWBjxT8r/ZMAByvvNKRDmaqjc3MsS+Z9VuudZwwye+A/4dNZHQXjESfSjtfIGtzc+3Fc9V0UaaDNlQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI0PR08MB10656.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(52116014)(376014)(23010399003)(1800799024)(5113699003)(22082099003)(18002099003)(6133799003)(3023799007)(38350700014)(56012099006)(10067099003)(261021123027099003)(261028144727099003)(261021121427099003)(261022105027099003)(261009223027099003)(261026121527099003)(261026140227099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bFFIZlNEaEZDZHQ5M1JQdmc0K05LYmRRTlVTVHFHMktGVFFLWlFkdU5QY200?= =?utf-8?B?cDQ2bDBYUUl6NVFNWEhvQ1UyM3YxWVg0RkpUQ0sxU1grV2k4bzZvb1VNVjR3?= =?utf-8?B?OGo2Mjg5b0hWVnRJQytBWjAyWk5jeko3VWQ3VU14WFhyZHE2c2xtQ3EyeUxy?= =?utf-8?B?UnhyUU5jaDBIcUZFN1kydndqMlQyc3l5U2t5azdnNSt2amtadW42TTJ0WlMx?= =?utf-8?B?T01PdVNlR0IrdDFYMDNYdlh3TDlkMDFhd1VGb1lDVXpoWW1CdlNJeSt5STE0?= =?utf-8?B?UjRFWm9IUEsyUElSb2JTSS91R1dMNEdGRXlOd2JEQ1FQOXorVEJTQWpHN0FD?= =?utf-8?B?WXNnQjNzdGluUldnQVhXVTBlUW9hYnFJS3IrOENPWXZoRlBqcTQ0VnY0V1h0?= =?utf-8?B?VHdoMHlRM3g2aHNLV3JKQ2x4OFI1OHVWazcvRjRJd1V5UmVDaFBHQVN5cU1r?= =?utf-8?B?VmxlM2s2VVAwWWFnSDVGWU9PZnJWaHlJbHZQNElyMmdPY2MzbEhFekhKaHV2?= =?utf-8?B?NzJGb3hpVGZWREp3RytjVDMwM0dPeWVqTWl6amZYTnJpc3pVcW5DVzk1aHV5?= =?utf-8?B?cTFnNnovUXhUeVFVclhPOVdveVcvaHduek4ranlzRC9hR2c2UDZ3a1JqbFVs?= =?utf-8?B?emVwZ2RsVlllc25janE1MExpZGlQNkFZbE9YdGhiRE9tTU1DRW1hWnhEejQv?= =?utf-8?B?TWFDN1hZT3QzUTVvamhNQ2xFZ2dVOXlQUVQwNEM5TVliQWs3aWdjN0JsMVJt?= =?utf-8?B?RHZ2c0NUbUhsVGIrS0tCS3ZsUW5URlorR0trMm1LRDJybTRRT0tUQmRPRC9E?= =?utf-8?B?cjk1d09mQzlBQ2Vra2NjSlJTVG9qbmVsZXRQaXVqajF3Vzk2Yk4zelgyMjhP?= =?utf-8?B?cVFDN09VVld2dVlQYWNUcXVJLzJNQ05BN0FSZ1I2Y2dyREx3TlpxYmJocC9V?= =?utf-8?B?bXZyeDQxRFBSemZ5TVRMQXd2RDVLSXpDNmpKVG80bHNlem1aNktpWGh2Rmho?= =?utf-8?B?VVVOL1lpSTdKNStTTzYyNlFnUGkyZnZCSHFZWTE5NmZFYk5DYXd6Y25EZWpo?= =?utf-8?B?ZmZlc1FSZkkzS1psaER0OEJpWWZSWnVlak1jTlpTc254WkdaYXBieFoySmo3?= =?utf-8?B?bitvaE5pRkw4bncrSjVIbkRCd0Z4UGZuRWFwVWRqVkRndUpjb2dLL2RmUXFP?= =?utf-8?B?YzRXSUdjL3JzVFhMKzAvaTZDSHc2dExxZmNaZ2lJdm5ZNmhPSXBWNjVJRXRM?= =?utf-8?B?TWlyck5ZcHZYUXZ4SzI4MUNtZCtIV090TUhyeXlRZk1mRGxkTCtucnRjd0du?= =?utf-8?B?ZzByWVB4U1pVTHJTSFBxcUtkRmVEaW1JWW1DZ3ZuZy9kbVdtRm1BM01oeC9q?= =?utf-8?B?QUZnNW9RR09rMGRnSWZ2YlpuZ3FoUnBLV1RuR0JnNzA2NkJyLzRMYmtMRU52?= =?utf-8?B?Nm8xb0liYUp2NzdNOGJPMUhJYnNwWWNLemFCNzZnK05oeU1CenBqeU1RQXN6?= =?utf-8?B?S0czRDZuYVpHVzJxNUFVZlpDQkdaT3lTT3NnajUwaER2RjNBQThtSnlFRUJD?= =?utf-8?B?TFR6SWVxYm9Dd0NaUTR5emluM3NXZDFMckR1Z0k0ZGFwQTFVVzhiZkVEa0E0?= =?utf-8?B?aFhPU3pkczFXRUVYUmkvZmQ0RjNWb3R4bWc3Uy9uT1UvcldydE03eEpsMVpN?= =?utf-8?B?OE5CcURZblRaT0hEak10TENxMWhTeDdKN3ZPeVo5bXR6a3kwZ0d2N2dLZ3lm?= =?utf-8?B?Ui8vSnJTbDV0b3FQQ05FdGgvcEZ0Q0tXS0tTdXRoSTZpYXB6eXBVdTZhR0V5?= =?utf-8?B?V2EzcVhiUEVWOEx2MkhFcERRcytGM0R3Q1ZUbmtramZOOUVUYUQ0TXdIdTV1?= =?utf-8?B?OVpWOWw0YUR1Y3dKcE5mMmdhME42dlFnT1phSmdveW90cllsSkhvSTRlR1lv?= =?utf-8?B?QVkwNlR3RG1GaWRxSHNoN0NRNWdWVlp6djlCaHJnUXdUOXY1bUxOVkpia1ZM?= =?utf-8?B?WkdwR1ZrMWMxMVNpMnhBS0piNzc5OGhoWjNTVy85MVovNUlEMytkd2JONE0y?= =?utf-8?B?ZnlPTE1BYXFyOXJ5aUpUV0VuK2lRTmp4ZDVRb1RVR3BVNXpkdHgzRXZaSmlQ?= =?utf-8?B?TThydDBtSXB2OUdIVjFZaUxRVktWLzZqVy9wOElkVXFyYzVlUmdzeXpYbnYw?= =?utf-8?B?bXhlMnZoOVVXUWtJWk9OcjRyWjR2bzBGTzRpMUNZc3hIMHNnR3ZjbzBUellJ?= =?utf-8?B?b25ZblZNN29kaVlkTC9ENEk4bkdXeWJFWlBSbG1xeEl2Um1xUFRPd2x3WkJm?= =?utf-8?B?bzBNZGdxa0VXb2dEb3gwVjVNWXVraVF6Rnd2U1RjM0tHaXRSTTBzS0ZMWTBL?= =?utf-8?Q?FKJOR1B536FMaggw=3D?= X-Auto-Response-Suppress: DR, OOF, AutoReply X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00b01869-eb0c-4bc7-119f-08df36947ca0 X-MS-Exchange-CrossTenant-AuthSource: VI0PR08MB10656.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Oct 2026 14:45:48.5093 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jcotrJts4549iP9qQF9KEYqqBF7qJgg6FCNE9wfbEhQqQbIQv+scnUmrYZHFbQwpqCw0grKl2tfhL8V4ecSH0eIjNje6jiiO6eYxDw+NZOU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR08MB7451 From: Fabiano Rosas Move this CPR-specific code into a cpr file. While here, give the functions more significant names. This makes the new idea (after cpr-transfer) of having two parts to qmp_migrate slightly more obvious: either wait for the hangup or continue directly. andrey.drobyshev: This commit was cherry-picked from the upstream commit f523e5aa5f56, adapted for the hci-dev base, which predates the upstream qmp_migrate() rework around MigrationChannel: the watch is still armed with the plain MigrationAddress from qmp_migrate() rather than main_ch->addr, and qmp_migrate_finish_cb() keeps closing the cpr state and destroying the HUP source itself. Reviewed-by: Peter Xu Reviewed-by: Prasad Pandit Link: https://lore.kernel.org/qemu-devel/20260123141656.6765-24-farosas@suse.de Signed-off-by: Fabiano Rosas --- include/migration/cpr.h | 5 +++++ migration/cpr-transfer.c | 23 +++++++++++++++++++++++ migration/migration.c | 29 ++++------------------------- 3 files changed, 32 insertions(+), 25 deletions(-) diff --git a/include/migration/cpr.h b/include/migration/cpr.h index 8fb79eb0a28..ae441322ff5 100644 --- a/include/migration/cpr.h +++ b/include/migration/cpr.h @@ -9,6 +9,7 @@ #define MIGRATION_CPR_H #include "qapi/qapi-types-migration.h" +#include "io/channel.h" #include "qemu/queue.h" #define MIG_MODE_NONE -1 @@ -76,6 +77,10 @@ int cpr_get_fd_param(const char *name, const char *fdname, int index, bool cpr, QEMUFile *cpr_transfer_output(MigrationChannel *channel, Error **errp); QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp); +void cpr_transfer_add_hup_watch(MigrationState *s, QIOChannelFunc func, + void *opaque); +void cpr_transfer_source_destroy(MigrationState *s); + void cpr_exec_init(void); QEMUFile *cpr_exec_output(Error **errp); QEMUFile *cpr_exec_input(Error **errp); diff --git a/migration/cpr-transfer.c b/migration/cpr-transfer.c index 00371d17c3a..61d5c9dce2b 100644 --- a/migration/cpr-transfer.c +++ b/migration/cpr-transfer.c @@ -6,7 +6,10 @@ */ #include "qemu/osdep.h" +#include "qapi/clone-visitor.h" #include "qapi/error.h" +#include "qapi/qapi-visit-migration.h" +#include "io/channel.h" #include "io/channel-file.h" #include "io/channel-socket.h" #include "io/net-listener.h" @@ -72,3 +75,23 @@ QEMUFile *cpr_transfer_input(MigrationChannel *channel, Error **errp) return NULL; } } + +void cpr_transfer_add_hup_watch(MigrationState *s, QIOChannelFunc func, + void *opaque) +{ + s->hup_source = qio_channel_create_watch(cpr_state_ioc(), G_IO_HUP); + g_source_set_callback(s->hup_source, + (GSourceFunc)func, + QAPI_CLONE(MigrationAddress, opaque), + (GDestroyNotify)qapi_free_MigrationAddress); + g_source_attach(s->hup_source, NULL); +} + +void cpr_transfer_source_destroy(MigrationState *s) +{ + if (s->hup_source) { + g_source_destroy(s->hup_source); + g_source_unref(s->hup_source); + s->hup_source = NULL; + } +} diff --git a/migration/migration.c b/migration/migration.c index b365e413a84..d892655a21e 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -110,7 +110,6 @@ static bool migration_object_check(MigrationState *ms, Error **errp); static bool migration_switchover_start(MigrationState *s, Error **errp); static bool close_return_path_on_source(MigrationState *s); static void migration_completion_end(MigrationState *s); -static void migrate_hup_delete(MigrationState *s); static void migration_downtime_start(MigrationState *s) { @@ -1508,7 +1507,7 @@ static void migration_cleanup(MigrationState *s) qemu_savevm_state_cleanup(); cpr_state_close(); - migrate_hup_delete(s); + cpr_transfer_source_destroy(s); close_return_path_on_source(s); @@ -1669,7 +1668,7 @@ void migration_cancel(void) migrate_set_state(&s->state, MIGRATION_STATUS_CANCELLING, MIGRATION_STATUS_CANCELLED); cpr_state_close(); - migrate_hup_delete(s); + cpr_transfer_source_destroy(s); } } @@ -2266,25 +2265,6 @@ static bool migrate_prepare(MigrationState *s, bool resume, Error **errp) static void qmp_migrate_finish(MigrationAddress *addr, Error **errp); -static void migrate_hup_add(MigrationState *s, QIOChannel *ioc, GSourceFunc cb, - void *opaque) -{ - s->hup_source = qio_channel_create_watch(ioc, G_IO_HUP); - g_source_set_callback(s->hup_source, cb, - QAPI_CLONE(MigrationAddress, opaque), - (GDestroyNotify)qapi_free_MigrationAddress); - g_source_attach(s->hup_source, NULL); -} - -static void migrate_hup_delete(MigrationState *s) -{ - if (s->hup_source) { - g_source_destroy(s->hup_source); - g_source_unref(s->hup_source); - s->hup_source = NULL; - } -} - static gboolean qmp_migrate_finish_cb(QIOChannel *channel, GIOCondition cond, void *opaque) @@ -2294,7 +2274,7 @@ static gboolean qmp_migrate_finish_cb(QIOChannel *channel, qmp_migrate_finish(addr, NULL); cpr_state_close(); - migrate_hup_delete(migrate_get_current()); + cpr_transfer_source_destroy(migrate_get_current()); return G_SOURCE_REMOVE; } @@ -2374,8 +2354,7 @@ void qmp_migrate(const char *uri, bool has_channels, * connection, so qmp_migrate_finish will fail to connect, and then recover. */ if (migrate_mode() == MIG_MODE_CPR_TRANSFER) { - migrate_hup_add(s, cpr_state_ioc(), (GSourceFunc)qmp_migrate_finish_cb, - addr); + cpr_transfer_add_hup_watch(s, qmp_migrate_finish_cb, addr); } else { qmp_migrate_finish(addr, errp); -- 2.47.1