From patchwork Fri Jul 21 14:49:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Het Gala X-Patchwork-Id: 1810969 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=nutanix.com header.i=@nutanix.com header.a=rsa-sha256 header.s=proofpoint20171006 header.b=jxuC6aPI; dkim=pass (2048-bit key; unprotected) header.d=nutanix.com header.i=@nutanix.com header.a=rsa-sha256 header.s=selector1 header.b=T/r1rkl8; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6st137pbz20Fk for ; Sat, 22 Jul 2023 00:50:17 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMrRo-0002yL-T5; Fri, 21 Jul 2023 10:49:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMrRl-0002nX-T7 for qemu-devel@nongnu.org; Fri, 21 Jul 2023 10:49:35 -0400 Received: from mx0a-002c1b01.pphosted.com ([148.163.151.68]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qMrRj-0004mk-WB for qemu-devel@nongnu.org; Fri, 21 Jul 2023 10:49:33 -0400 Received: from pps.filterd (m0127840.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 36LCwD6r029460; Fri, 21 Jul 2023 07:49:30 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= from:to:cc:subject:date:message-id:references:in-reply-to :content-type:content-id:content-transfer-encoding:mime-version; s=proofpoint20171006; bh=VOYz5S/4uYWfmd8nUc24UL/Kyx+8c7qNbEVR9P b3iZs=; b=jxuC6aPIWp6gVOnpBsxVxoYTWMFxlzGjJznK8Y0eBD1YBovvhcLeEq FhjhxI+y2Mbng9VlSBzewQDKAqX8OBouJqYlQQZZstVB/Unx1n6tXAxO0t8774Bp 19cB/ER3tHI5vdu6s9R3cZn9wU0qsESWdJKHpY9Go/H8uNS64VWpKMSFr7WVIDQo zi45raJeRpIPISZojaC0YhkI2w74fj6DejZAWmi/EXiuHvnDtuPEix1G0cjTF7E9 Z4A9QQrNjHuMnkhSOfXCiO8Q860sdlWrJz1owcoRNKb7Njyh7zqA72FIQYiLBJ7i kQSxzG23bKhbM+YrAN+yi/DLXWYzNl5w== Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2046.outbound.protection.outlook.com [104.47.51.46]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 3rx319phvm-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 21 Jul 2023 07:49:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VkRMYdiyTGPkThkJmRmsaL9NL5CeBz3iznNK/9a2MwjqawHgIgXJbZFGwmbZEEVEPAsf9PBwuXDwyDSSo05NWFf/wAc17LkocyjN6Ih5ky+KMA3YaGZe3V4MFrgVyWR12vSsIhM9DrUd8epiAFldQhXYAQwlhK2hSWeds3pa1RybNxlAfiq6ZzBxdnvB9ataEyjekJY0dhiwRfBJAvofyLs0P0tpRiwHo9DS0h+nIguh6zXnofE/YCkaaXpPgszwRztzT05ef4V4CMP7OfKXFc+0tm6+M3yM7m55zCZZmOS5ojeNUY3RNPmoVVo/15MGZfyAm4L2e6aewlJnlvQGDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=VOYz5S/4uYWfmd8nUc24UL/Kyx+8c7qNbEVR9Pb3iZs=; b=HFipw8MBDjxZn0T4eq9VAxeKIw506Wt7VHHH3zfNaneUX1G7Sl2wOTvCukAiSlJFSa5ltnF/6Pg3wqucDKtH4CEsz2MIzz4vcA3xuJtPH/SZ6FmrgndtXO5otQrWrUFYBVmlPqYwTr002ts+OpEpKZQfcXcAILrZbUgiSS7K8eg/VYtYDkjWy+xMMIE3B6aabQYIBJb6ayKuUCfIUTJYLfRikeC5ng3pklBicn0CFHPta5YmBdvVTycsnomsHMrF3oTIsXK4WtCxvbjLO6Do3+CBtGN9fYBJ6g9f3j7e9rGpSoLcF2uI4fdOYdECLMacRQMr5eueIVS5ZLqyKhURBw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nutanix.com; dmarc=pass action=none header.from=nutanix.com; dkim=pass header.d=nutanix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VOYz5S/4uYWfmd8nUc24UL/Kyx+8c7qNbEVR9Pb3iZs=; b=T/r1rkl8rJs0ihLBiCGDT6uhVJ5DdCPTs7YW5OLsSpPhscgQttgrm7EMu0lgisR7iYJ1uz8B38WWko/x/N5oZGJvrzwOD2p030OBNQxOsYdZrKxabfYlCqnxSZYZLfcvLfTwKP2DXSw0HnkWgZmj9YN9CohTpiUbgwaa24Zllq8kCTD9uKyX2lA7YGwOJLb3vQIEGx8CpmLjVZfKHChQKs7/qTkHyDUKE2V2xJzuEbOmwhfkZMa63nVHZI7MJkk2cQkMgV5rxs/jiJTnUC/snDk+jhdgfkmeYQ4BW8eiZdL2TVFOSrs2yahHOMUVxNaZnbrmtd7ojE2vxM91a9D/Zg== Received: from BYAPR02MB4343.namprd02.prod.outlook.com (2603:10b6:a03:57::18) by SA2PR02MB7561.namprd02.prod.outlook.com (2603:10b6:806:140::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6609.24; Fri, 21 Jul 2023 14:49:29 +0000 Received: from BYAPR02MB4343.namprd02.prod.outlook.com ([fe80::89a1:d75c:813:618e]) by BYAPR02MB4343.namprd02.prod.outlook.com ([fe80::89a1:d75c:813:618e%7]) with mapi id 15.20.6609.022; Fri, 21 Jul 2023 14:49:29 +0000 From: Het Gala To: "qemu-devel@nongnu.org" CC: Prerna Saxena , "quintela@redhat.com" , "dgilbert@redhat.com" , "pbonzini@redhat.com" , "berrange@redhat.com" , "armbru@redhat.com" , "eblake@redhat.com" , Manish Mishra , Aravind Retnakaran , Het Gala Subject: [PATCH v9 05/10] migration: convert exec backend to accept MigrateAddress. Thread-Topic: [PATCH v9 05/10] migration: convert exec backend to accept MigrateAddress. Thread-Index: Adm74o1FEhxkOQ2ejke62AvxQfbATQ== Date: Fri, 21 Jul 2023 14:49:29 +0000 Message-ID: <20230721144914.170991-6-het.gala@nutanix.com> References: <20230721144914.170991-1-het.gala@nutanix.com> In-Reply-To: <20230721144914.170991-1-het.gala@nutanix.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PH0P220CA0028.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:d3::17) To BYAPR02MB4343.namprd02.prod.outlook.com (2603:10b6:a03:57::18) x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BYAPR02MB4343:EE_|SA2PR02MB7561:EE_ x-ms-office365-filtering-correlation-id: 7f3ed791-6dd0-4e03-04cd-08db89f9afca x-proofpoint-crosstenant: true x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: e72fazQdGNASiWpdoYuSkIX0gncfF05QR7M7e4S/BexM08UQEQB8etoDqBQ8Atb5sMXwHQcTc2l5xfZs69PfAcjFWjhrM2h9ltXGfkZMiiMS+xw4KGHnVBOg125sC+iTP6+s9MqK/+oisXOYlshuA6NoeRXtnYmizR61eye0soI3kgjHh4nCRG9HRzbIA1cpR/Wp/eM6mI9a2R7orTPsPseH2+WmPOWtZMn3LXZSHHOBuaNe2U3whTSycI8+62rJNDMreih27s5gxWEmexutkdbSXfaJwrPfL7R16gIfB2b1L5j1UX7EvGty47NVzJWLCDJclCznvI1JFwetIyHRYLt07k4YpOS0hpmY1sBqJP5xlDjivXSRAnlIfG4HAoLnvzctqnudpEI2kM1TTh0E6hfnPhkOsB2RF/XK/WjevvsmwXGG3R5iSyI1j/Rd5hogAm3SvsAZUBmPQ67WR4arXMWwlavqlGiI7CGY8aH2Lhum/tNgrnU1yh9uz7DsNybiuJMy0g5SFy7OVL7qg6jQ0pIYKVlF9dIFFjyK9lB8mXOWxgpLx+mDWtWHMR0c6+lI9K6oj8GkIoH8f4QEJ4x3Yis8jtW9BX2CWCIh+65xmgrNMCjb/5sjmGy4yGggX773I7cPo36s38IsjFZEREVkxw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR02MB4343.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(396003)(39860400002)(366004)(376002)(136003)(346002)(451199021)(2616005)(6486002)(52116002)(6512007)(71200400001)(478600001)(86362001)(26005)(1076003)(107886003)(6506007)(36756003)(5660300002)(4326008)(44832011)(6916009)(41300700001)(8936002)(8676002)(316002)(2906002)(122000001)(38100700002)(54906003)(64756008)(66476007)(66556008)(66446008)(66946007)(38350700002)(186003)(83380400001)(218753002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?utf-8?q?c1nAxFA1n7TILPOK7Y9A98RgC8kQ?= =?utf-8?q?ke6sjhew74uCZNI4HsN+55BVEmbS3IhaGbJUg792Ah+iKjxM+G6icxLPyr6QLf3n9?= =?utf-8?q?mMxw2Vqs/dj9hTcnL8THqD/0dNr6PekeciWs2l7Gr/jwYO39dzsC94uTb/p4Zq0BN?= =?utf-8?q?9T0aeSWvb3ksDEwxh/HcICiaUx+kl4+sIbmZ+g1dIW7l+m5WuA0RLggLbQHzNLenO?= =?utf-8?q?3yX6hKmSEcVfYWEobml6PgLovM9QM1QTUy0UxjVo3P/4dNr9plf83ISDpFKwyjxAh?= =?utf-8?q?kYWnghLGJFDaUajkCSJNA2itAAVqbXP1pN2bkMV0pkwpeKP+bMeGP/b4JZouoAFCD?= =?utf-8?q?P4bSq6hH8ABbWmrEC9/F/wDTVYaDWbEhipiI+eeXh+LaGeEoADZLr/0hVid5Odt89?= =?utf-8?q?wOuP+ziBPeg5PNpI4VA4hI3IkY4RtvqY8jWbjAQ2S7jl9JKQO6BYTHurQXnxvn4Ej?= =?utf-8?q?6KsKG+JKwuB4y2sWkXE8wn6aPaPZKYUrzhjT1FxCGPPzBlR1UIrn+CUKkroIuh8jP?= =?utf-8?q?EGeHIXp/7AEXqR9M2Rb92j0oUVRrNGjC1kbCxeJvJys67FtByDGlhFaJNAYoeZeAf?= =?utf-8?q?QiL/bycRlyWLaOix1gWakvuQlD+8yia419/IuToOoHUS997xBDG5XSMwD2q0hoIpF?= =?utf-8?q?ixpdujuF+8Mx/D2QAupph3X/HpkAQ1Pyw8aT7zF9gvzJcMXeT4187f43z6HaeFYF5?= =?utf-8?q?8TPYmJ4p0WzV7gpbTP2d0UYO4sLJNFxZDSjrRkt+XHOl4bcOY55Gcsdaf1TKKvqcb?= =?utf-8?q?dT7cJvm3qgcHwbxSFA5nyGZ+vtVlD99rasHgEeAK1ya0Ar5Ot1HHgSapYkoV+d8RZ?= =?utf-8?q?05APCpcKgoK77csYPTj9K85wGtMCKSlTm/iIbXUzQgtB//lL3cL5VihJPqBjWqbdA?= =?utf-8?q?oTjXxG8fKsr6DA7ZTLAFh1nG/A5X8PCnfh1/xLaft4i3XHKVdfxaZQP7cdd/oy7W1?= =?utf-8?q?oGjJES+4nhbQwancnUzRQOuyOjxp4XQ2nnbwxDM0SJmgl5gzS+TYwoHJ3I8Qd9D/p?= =?utf-8?q?idqrDyncAzuCJEFeemDdNOvXHRLmJxZzAJiW9UHxNtFjkOB9Lk11CXWXb5+nx1wU8?= =?utf-8?q?D9+fYIxgCCTFHzodcAtNlwcw0Ug8HaZ9KPMBv3nRzGqdWGjVe1Utm5ubbtXIhXgb/?= =?utf-8?q?uf7vs1H63EjYwkHw8AKdhSDkUJeK337SGuA3bMt2Bx4z/uX5b5PDtwUQfBqAbW22e?= =?utf-8?q?mKef3wuZIsMZyQnstMvNjaJRWyGTgWWk+dJQcco9UNnIvrB3cH3Ul4zBGYEVWF4pq?= =?utf-8?q?4EHkWW6L4Hm4XP5mcP/G9Qb9EU6+FAHPsAioZAkYaUH68upecz0MiIfFVxJZqVf7y?= =?utf-8?q?st//pDSnq9KQoxB/EnXToDDEgJre3PLFBvSje1ssYM9jZj+YiB1uDIYXiwBG+rAPx?= =?utf-8?q?3yUSrHyU/EUf+kydIg0x13QFoytwkdG5qTVyyn03tZ0GStf6y8QxuOg3CUMz61HL7?= =?utf-8?q?LR7Zb8zsfUacRemFIjQwyY8bkIC52OwKm4tOiNY/YT+o30y/uwxDVpfN+G1a2hYXU?= =?utf-8?q?ZYns33+ZrsaGvVI5kPQVtkXPxYgfM56YRw=3D=3D?= Content-ID: MIME-Version: 1.0 X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR02MB4343.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7f3ed791-6dd0-4e03-04cd-08db89f9afca X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jul 2023 14:49:29.1579 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: bb047546-786f-4de1-bd75-24e5b6f79043 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: MEXtDuyBFFnEY6p4wEyMfno/IpKwb9y6nun4uxGbCLT3VsN3tYDv1GYo0fO1OppZVtsKGtKqJs4ZiPHBMDUZFQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR02MB7561 X-Proofpoint-GUID: Wj51MFHXrPQsaRS5EfWkMGHCKEQKECc7 X-Proofpoint-ORIG-GUID: Wj51MFHXrPQsaRS5EfWkMGHCKEQKECc7 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-21_09,2023-07-20_01,2023-05-22_02 X-Proofpoint-Spam-Reason: safe Received-SPF: pass client-ip=148.163.151.68; envelope-from=het.gala@nutanix.com; helo=mx0a-002c1b01.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_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Exec transport backend for 'migrate'/'migrate-incoming' QAPIs accept new wire protocol of MigrateAddress struct. It is achived by parsing 'uri' string and storing migration parameters required for exec connection into strList struct. Suggested-by: Aravind Retnakaran Signed-off-by: Het Gala Reviewed-by: Daniel P. Berrangé --- migration/exec.c | 71 +++++++++++++++++++++++++++++++------------ migration/exec.h | 4 +-- migration/migration.c | 10 +++--- 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/migration/exec.c b/migration/exec.c index 32f5143dfd..8bc321c66b 100644 --- a/migration/exec.c +++ b/migration/exec.c @@ -39,20 +39,50 @@ const char *exec_get_cmd_path(void) } #endif -void exec_start_outgoing_migration(MigrationState *s, const char *command, Error **errp) +/* provides the length of strList */ +static int +str_list_length(strList *list) +{ + int len = 0; + strList *elem; + + for (elem = list; elem != NULL; elem = elem->next) { + len++; + } + + return len; +} + +static void +init_exec_array(strList *command, char **argv, Error **errp) +{ + int i = 0; + strList *lst; + + for (lst = command; lst; lst = lst->next) { + argv[i++] = lst->value; + } + + argv[i] = NULL; + return; +} + +void exec_start_outgoing_migration(MigrationState *s, strList *command, + Error **errp) { QIOChannel *ioc; -#ifdef WIN32 - const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL }; -#else - const char *argv[] = { "/bin/sh", "-c", command, NULL }; -#endif + int length = str_list_length(command); + g_auto(GStrv) argv = (char **) g_new0(const char *, length); - trace_migration_exec_outgoing(command); - ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv, - O_RDWR, - errp)); + init_exec_array(command, argv, errp); + g_autofree char *new_command = g_strjoinv(" ", (char **)argv); + + trace_migration_exec_outgoing(new_command); + ioc = QIO_CHANNEL( + qio_channel_command_new_spawn((const char * const *) argv, + O_RDWR, + errp)); if (!ioc) { return; } @@ -71,20 +101,21 @@ static gboolean exec_accept_incoming_migration(QIOChannel *ioc, return G_SOURCE_REMOVE; } -void exec_start_incoming_migration(const char *command, Error **errp) +void exec_start_incoming_migration(strList *command, Error **errp) { QIOChannel *ioc; -#ifdef WIN32 - const char *argv[] = { exec_get_cmd_path(), "/c", command, NULL }; -#else - const char *argv[] = { "/bin/sh", "-c", command, NULL }; -#endif + int length = str_list_length(command); + g_auto(GStrv) argv = (char **) g_new0(const char *, length); + + init_exec_array(command, argv, errp); + g_autofree char *new_command = g_strjoinv(" ", (char **)argv); - trace_migration_exec_incoming(command); - ioc = QIO_CHANNEL(qio_channel_command_new_spawn(argv, - O_RDWR, - errp)); + trace_migration_exec_incoming(new_command); + ioc = QIO_CHANNEL( + qio_channel_command_new_spawn((const char * const *) argv, + O_RDWR, + errp)); if (!ioc) { return; } diff --git a/migration/exec.h b/migration/exec.h index 736cd71028..3107f205e3 100644 --- a/migration/exec.h +++ b/migration/exec.h @@ -23,8 +23,8 @@ #ifdef WIN32 const char *exec_get_cmd_path(void); #endif -void exec_start_incoming_migration(const char *host_port, Error **errp); +void exec_start_incoming_migration(strList *host_port, Error **errp); -void exec_start_outgoing_migration(MigrationState *s, const char *host_port, +void exec_start_outgoing_migration(MigrationState *s, strList *host_port, Error **errp); #endif diff --git a/migration/migration.c b/migration/migration.c index 8012f93f1b..f37b388876 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -468,7 +468,6 @@ static bool migrate_uri_parse(const char *uri, static void qemu_start_incoming_migration(const char *uri, Error **errp) { - const char *p = NULL; g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1); /* URI is not suitable for migration? */ @@ -494,8 +493,8 @@ static void qemu_start_incoming_migration(const char *uri, Error **errp) } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) { rdma_start_incoming_migration(&channel->u.rdma, errp); #endif - } else if (strstart(uri, "exec:", &p)) { - exec_start_incoming_migration(p, errp); + } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) { + exec_start_incoming_migration(channel->u.exec.args, errp); } else { error_setg(errp, "unknown migration protocol: %s", uri); } @@ -1693,7 +1692,6 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, bool resume_requested; Error *local_err = NULL; MigrationState *s = migrate_get_current(); - const char *p = NULL; g_autoptr(MigrationAddress) channel = g_new0(MigrationAddress, 1); /* URI is not suitable for migration? */ @@ -1731,8 +1729,8 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, } else if (channel->transport == MIGRATION_ADDRESS_TYPE_RDMA) { rdma_start_outgoing_migration(s, &channel->u.rdma, &local_err); #endif - } else if (strstart(uri, "exec:", &p)) { - exec_start_outgoing_migration(s, p, &local_err); + } else if (channel->transport == MIGRATION_ADDRESS_TYPE_EXEC) { + exec_start_outgoing_migration(s, channel->u.exec.args, &local_err); } else { if (!resume_requested) { yank_unregister_instance(MIGRATION_YANK_INSTANCE);