From nobody Fri May 17 03:39:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1712747776; cv=pass; d=zohomail.com; s=zohoarc; b=YwfDIyjV5L6mu73+ZU71ODcs2bkPJkG7HcWYdxKfDZRlsDHY7zU5eunNK1VWAbyXGSpz/bfLeA95uh3l8jFbOtgbdnqyQN2rTqgixRNEKrvy88/fKrvH7FHhypphb47ZgAUg5ULYuWZhw9VSaR39ItdgmLMrIbWQhbLrGa6/j/U= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712747776; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BBveIMQzMN9VGFFWv+Q5S69+yVwy83mk/iUU64mV9i0=; b=Biv0/FIV3/DWMZRfMksZUzi5N0pAhp6JAgOn1n2rU7QvN747iTF/ZPf3Upzn8xwdLjFkRGCRIQ3UucZgMdMwuC7eGepfD0fnnB2ZS1PPJLX6x06Fqvfh+acpO2gWPyFFOEi9q/cM9gD5Se1K0hQ7uCfIRBk2Dx6nccm/7KIeYtA= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712747776246636.2262024822879; Wed, 10 Apr 2024 04:16:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruVvw-0007X8-2o; Wed, 10 Apr 2024 07:16:04 -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 1ruVvr-0007TE-6N for qemu-devel@nongnu.org; Wed, 10 Apr 2024 07:16:00 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruVvo-00019J-5R for qemu-devel@nongnu.org; Wed, 10 Apr 2024 07:15:58 -0400 Received: from pps.filterd (m0127841.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 43A84cHU006475; Wed, 10 Apr 2024 04:15:52 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 3xdpxe89hd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Apr 2024 04:15:52 -0700 (PDT) Received: from SJ2PR02MB9955.namprd02.prod.outlook.com (2603:10b6:a03:55f::16) by CH2PR02MB6791.namprd02.prod.outlook.com (2603:10b6:610:ab::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 11:15:51 +0000 Received: from SJ2PR02MB9955.namprd02.prod.outlook.com ([fe80::225c:2edd:87e:7cf0]) by SJ2PR02MB9955.namprd02.prod.outlook.com ([fe80::225c:2edd:87e:7cf0%7]) with mapi id 15.20.7409.053; Wed, 10 Apr 2024 11:15:51 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= proofpoint20171006; bh=BBveIMQzMN9VGFFWv+Q5S69+yVwy83mk/iUU64mV9 i0=; b=RdzxV34KH2EaHVgBQRYEHlXOWOwJoDtEItV1FAHwJU6eNsmRKLM1bp7a4 wmWzcIlRlf5a8UolQldmbQgIIM0SQ62B4+xBCQl7T8p3WbQW0xYK0O3lsbhVI6pC RnhtlpHatyXk7FoZ8bv10+rjwOpbPQc6WuRIZ/kf/PVorWx0GiRmPApMpy5kEMDS TOJUjSIUPfOfRgKXktpo6aNWv66qLkbH3xjDEmruKd70p6ZTrNTHoab7fvoIJBvs Pq3CeWTad21967FXh9uG82J89FUat+Li40UGrMefYMjRu5EDbRRmAYZaSFccBm6u Nda8ng8lHe5YGlfU/pOFRKYoFftmw== ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R0HybIi6Uq3+EUZV/qCXnyKaA23bO3mKS4WQNr7XFExvZPv6WCG0Eu7CfI4K2WnEjMCLUjK0T3dIht3zuLL7w+X89qT7F1r8dMKnZGEuJji/puYGySA0G+7JHayXKp1Bwq7ShaBLuXSJOUwALmFy5TnL0aRTIH7wJeEDoq1Lj0zm9Hd94Akxip3QzZhzmNFo0Ot9dVgSsW3xFt693RdbLYJDXY1vlo7/fguwyp98i6o++P6cCuZ52iJQV2jonBCmm/qRaH3/KelZu3JfiDuwcW+Ebt2KgN2G8U2aOxUssWetF7kUujU/8Zn60lieJTJwb24sKdphD1kjnJa543MVjg== 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=BBveIMQzMN9VGFFWv+Q5S69+yVwy83mk/iUU64mV9i0=; b=DoTGvHpXeSNVcjB5yCFYjVEBlt9PQ6ceAj5Ka6ClsZYRnFXKy0uQkl32Mkgo2mRY58biTV7RXvuax4lwh8/d0wprCqd0q9f38tx+ePos+Dird7SJTAGAxYorfieoDz+QGciufsf4kvCPFEQQHoPKXsmVvis0bsQ9+EH5m1zQfgYmmS1xCgZRXjGUKndfd6N8nRNs2NAomFAcLULP5vxckNNSHXWBECmmEvxoslDLzEPTsEmUid9rDSGg47E2MnHNBWomfb1RjzScXq0GSB7xldoCpDZc5RVuXPBdjBSGr4iMwNC0b/nF6aYDmeHuN2MftqtWi1WaUCXnQ2PQYzzXsQ== 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=BBveIMQzMN9VGFFWv+Q5S69+yVwy83mk/iUU64mV9i0=; b=kHxx0rt3FiX3N5dc2wzyrqNaFzubAnkE1yJOWyOhjk78kb6luy4ZJ193UeT9JLoc1ms9nsG24RYI0o1xPbA2f85oDjj6qaGA4EQI1lnq1KnSXewRLGcf3Xcvz6MQh/nlZxPI6BHlpeest7v61VkreDypq5O2o+0mQYz1+qubgKq2Xpk3IX2FmXH9fKPUcu1XrjPKnBs9GuXKTu3mG3D/mcIeKaVYnBIhCrsTRJZiRhnnrHmx6QqCYUKl0GJptf7KyGlexYllAX3Gd21vZJJ2jFmdNotV3Og4Hi42sGnGhzqWnQTv6Ctk8ZGVGnknHKFa05nh5lQr4xmydpWY9tWMQQ== From: Het Gala To: qemu-devel@nongnu.org Cc: thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, peterx@redhat.com, farosas@suse.de, prerna.saxena@nutanix.com, Het Gala Subject: [PATCH 1/4] Revert "migration: modify test_multifd_tcp_none() to use new QAPI syntax" Date: Wed, 10 Apr 2024 11:15:38 +0000 Message-Id: <20240410111541.188504-2-het.gala@nutanix.com> X-Mailer: git-send-email 2.22.3 In-Reply-To: <20240410111541.188504-1-het.gala@nutanix.com> References: <20240410111541.188504-1-het.gala@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PH0PR07CA0016.namprd07.prod.outlook.com (2603:10b6:510:5::21) To SJ2PR02MB9955.namprd02.prod.outlook.com (2603:10b6:a03:55f::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ2PR02MB9955:EE_|CH2PR02MB6791:EE_ 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: IwjnGvc4R8w+rUUiWt6JibJJd5bVfWdjXnJLKFbBT1d2Qaje/E8vXg46LQsQAHkALOiBG/fTqnlvLS/gaOMCyin3tlyb/10sdjzRRycKzaxBaLywvScuWjHcE48o10Gj07d4gPvOFHBtVpd74fQnkxFKmaejaz6gD8N7U6wmFW+L5bsPrqn5TMNgdMLUaiT3GdNF0tHRmCQAWM8HTiODkbUqB0rhBxOIPf7wdy73TKoKVRhxEytdKRvkQdogptSC1vvydJiwvJAHBSEQ/d4Xh30212e3WoFef2OdMdcbJncVcTz3leYdOJYpYNFHwmcRsoxY2l+9PPyadyxOIbCKIl9zaKY4gVgvL6grJuHX1btiHhXYtiA50aS8qIpKWGmm+WdBTjAF+n3pNwpRMHkHAv+srYl/Gaj3Qb0lxQNnNypZwsuAn+HnxQSPPEawVhgDPE1ThQzJeyqc77921+LXT+CPcZwFVwJomQnTjlb0DWtkD5+6J7CMxLcCyv2rb1GWY1cB/QOiW4RcdM4Ir6CRzoJO5tX5zKMro12Ikj1gCTErGs35Ie9qQdHUP2+HetdFRfne/tIpuSDuuhQztHWfgY4hL6BHRmeH+F1Z1kruXXxNbfyUYzbLvbCHMsHNBDuDGt6CwEwSTgSCtGCZ+MC9hS3LOEcobBElZHS7dxl4Kt9dye7QDPTeAo3TE+VS57YdiL92n9ZYJ5hfC7TRCiIhbtjlLQ55ySw6zK5Pzo8lCcY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ2PR02MB9955.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3rD/cBlG4gDBtq7zUtTeAihP4kWhfpNEEzj6CQyxLJv+mG7nMSsnwl6TIvca?= =?us-ascii?Q?PFB9lnLP2aNWmX155ot29R/M8+zbI8euMi4q+/zwBILVUUg2MVUqko8BaomJ?= =?us-ascii?Q?cwOQ3H3CNkKFZaX7QYsJ8NL4/N84mQJibJHMovbI7FJ0ixNKNNWNhSURTbCd?= =?us-ascii?Q?Rcom+EqeK6MKst8ITCRng79wXdh1sjfgQX8WBChRRkPfyk3fivUlwXdhnORL?= =?us-ascii?Q?WWkY1+BSFtfax5i1u+IZqtcau0fuNrdCaQFIgw3/toNtXWrmctXGY4gWQLEn?= =?us-ascii?Q?WU1JHoQxAOV52LDKTnyxFOvJKexPSyCwgsbYBUpBEflX5dlaEe0BmrOxxQkl?= =?us-ascii?Q?DyiVOzOvAl/lFHoOKJfZSdQFwc2xoskjq7ohpuCK4LueuAT0PrwFVf11SVhR?= =?us-ascii?Q?t4ukijesmNZCC9GWxbLdpKipqx3rxazbWqN+Yk8af9G03z8HtlhHRa6WBMC8?= =?us-ascii?Q?LyVn9a2rfAFW/FeRScC32zXxacRXaaauOeYGmqLmgz+yDk3yFGAmqp+O3zvx?= =?us-ascii?Q?onKDo7++DxGRsFydRKUjVnpZ56LUMVtDBuJlzf57qzu79YoDzKs9M6trQH0X?= =?us-ascii?Q?9Lg55r9gxmOyaHZ4+oQu889pqnaGTOop/YOLN8puKuLPMnq+ykO8JrhWSSxN?= =?us-ascii?Q?dzs+oe+wmCS/rICPbrM49zk4/Iojk6ogshdpQP2qbinm6pBVYJTv/hJf5Lf3?= =?us-ascii?Q?+Mo1OA/7qN6sHXqlKnM3Nu0eqrkpWMrYuR1Tkd4eY0hpwXh9UPRWFuIKzNpT?= =?us-ascii?Q?ie2jClzghsI+QU4P24HVA9qyeO7E1b1zEJmBP0IjZCCbv+aDVj8l/5+qiDO+?= =?us-ascii?Q?jTAepq0V7pG9HHIzdDDkNlJ+qMNfpSI+V5ciVjow9InDzuL7tsQNiYPRYgn8?= =?us-ascii?Q?rAPHvYtwMxpuiZhoHn6MT1MXcXEg/BZMAdGg8rDGWBiU/umDNQAA7NhhByA7?= =?us-ascii?Q?Gn95iXXPkHIij+R3cTCujhbBC/t/mYHIXolLGEIaxugNhm2jfeBzsDkUqvfN?= =?us-ascii?Q?hxUh3gsGFstAja5U1Kn1egB9iDGv/AZTrcxvNlS3FjVvX3etJYiUYyWJqKi4?= =?us-ascii?Q?WAu5LybY1XggFOU95kQVJp67xApCvoY/ei0ieeBQld2bGTZlKcSfEc+5YWBo?= =?us-ascii?Q?NfdiNFLFe2mmGkWHTcCUgU7uJY6sWDTi+tQ1/pb5ctFfBMxgGw9J3lQuPUMP?= =?us-ascii?Q?9ehA90CatH1MCFf2y6FLZWJ4YzK3pjnML7xb4NUae1ceyDIAfu/i++tOsimh?= =?us-ascii?Q?IKS8xggb49ZPihfNkixhoBpCdB0D3+7AC3FFLlY1cm/KImJ/WXKXhYskXA3a?= =?us-ascii?Q?aBtb8FCElmbY3uSmTitapLGUEo2fk10DZLkkt8HEng19jWH8WxLbefwVbAD+?= =?us-ascii?Q?7tJB0aYapctfL/3+z7oiTIChH9dfLUz0chJRAzhq1zY7iU2lvxHN34i+dMZ2?= =?us-ascii?Q?GRN9o0VCFIB1OMQFSIvBv0rK7hEHGEzu4XnCpj8Z3Oj8cDXrKXkqFgDx5ARF?= =?us-ascii?Q?kOaKqw7GeYIhQnLKGmolDVguCGeNu1M0jhzb9HGwmcipmoMsq5Sy60ZVmclM?= =?us-ascii?Q?JLM/K0rH/XzntJQEJVysFbKPSScuHGeq3MXSoP32?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5fd8c313-0845-44cb-2059-08dc594f948a X-MS-Exchange-CrossTenant-AuthSource: SJ2PR02MB9955.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 11:15:51.0142 (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: 2N+J5LCD3x781RuatYzaJhgQEtInTwauqDlIckfylryOiSu47B0xBB8aBnBaWZQj1ntlGhMJgeTnQjCUlXfMPA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6791 X-Proofpoint-ORIG-GUID: eXMkZQhB1G6tM0Sta88acIQA4A77-hwa X-Proofpoint-GUID: eXMkZQhB1G6tM0Sta88acIQA4A77-hwa X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-10_04,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=het.gala@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1712747777283100001 Content-Type: text/plain; charset="utf-8" This reverts commit 8e3766eefbb4036cbc280c1f1a0d28537929f7fb After addition of 'channels' as the starting argument of new QAPI syntax inside postcopy test, even if the user entered the old QAPI syntax, test used the new syntax. It was a temporary patch added to have some presence of the new syntax since the migration qtest framework lacked any logic for introducing 'channels' argument. Now that the qtest framework has logic to introduce uri and channel argument separately, we can remove this temporary change. Signed-off-by: Het Gala Reviewed-by: Fabiano Rosas --- tests/qtest/migration-test.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 5d6d8cd634..27a1066ae4 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1297,12 +1297,7 @@ static int migrate_postcopy_prepare(QTestState **fro= m_ptr, =20 migrate_prepare_for_dirty_mem(from); qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming'," - " 'arguments': { " - " 'channels': [ { 'channel-type': 'main'= ," - " 'addr': { 'transport': 'socket'," - " 'type': 'inet'," - " 'host': '127.0.0.1'," - " 'port': '0' } } ] } }"); + " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}= "); =20 /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); --=20 2.22.3 From nobody Fri May 17 03:39:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1712747826; cv=pass; d=zohomail.com; s=zohoarc; b=R9OI7G0psPTwbQMDlazAWPcJ0nnZGN6TyAMSG6N0q3hJhz07sf4Qosrg/mJAL/M0WivelVSd/ruNa+owMQw7X1O6iAulAMQY8ltVDk90CYrkVk1Jo68+oC7dVSl2vKDVcSqORoTZlmoQ0FzmyD/UXymsvpdo2VfZwcYEnsF4UEs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712747826; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=i319eQzVrMzWZgGm44SUMcldzNGFG5MMhuQv8ox8Guw=; b=E08mtYzefg2Wi27ss3h7bFOsQONYJPWYYsmlofcK3p1FHAlqoqkiM7cNUcVyayQbJGkODUR42Wg434J/2k1UQsvMo8Lz4wyqZiJ6Hxw8QvXDjW+tIm0MbvALYVMmbpUhR6EXcL4O+kIdupMgh1Q1LbIgq+/Y5viDnYLDoKlLzsk= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712747826511103.04701242519207; Wed, 10 Apr 2024 04:17:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruVvw-0007XN-BK; Wed, 10 Apr 2024 07:16:04 -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 1ruVvt-0007Tt-3D for qemu-devel@nongnu.org; Wed, 10 Apr 2024 07:16:01 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruVvo-00019N-5g for qemu-devel@nongnu.org; Wed, 10 Apr 2024 07:16:00 -0400 Received: from pps.filterd (m0127844.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 439H5sJm016731; Wed, 10 Apr 2024 04:15:54 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 3xct2k33fn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Apr 2024 04:15:54 -0700 (PDT) Received: from SJ2PR02MB9955.namprd02.prod.outlook.com (2603:10b6:a03:55f::16) by CH2PR02MB6791.namprd02.prod.outlook.com (2603:10b6:610:ab::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 11:15:52 +0000 Received: from SJ2PR02MB9955.namprd02.prod.outlook.com ([fe80::225c:2edd:87e:7cf0]) by SJ2PR02MB9955.namprd02.prod.outlook.com ([fe80::225c:2edd:87e:7cf0%7]) with mapi id 15.20.7409.053; Wed, 10 Apr 2024 11:15:52 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= proofpoint20171006; bh=i319eQzVrMzWZgGm44SUMcldzNGFG5MMhuQv8ox8G uw=; b=fRTx92ZTt7HMDHxNicdZnu9mnYmovEjv/mPv2t1D537iV3y6s4Li/kCDe WhKpUxTXPxx/T3eVU2zjr+n/zMHiZDDSq6Xtt+XAjmaUioxgY4K7mV831zwsGHSH FRiwrYsOBx3P9ltvXCIjeFNVArt7YrGGmELq5XICei8nXsmckBO27DxdTvwef1Rr wgnH61KdZpX438Npn1woobvgRE9UvYhoML+d9ymlE+VMz+id0hB+4YTgIzowpIU6 mfqkH2xUauTIKjvgG7zRKY6VDRv27LHslaG//YZXAj9wFXv//OgERfpuRJX26+nR 0zjnL+n2jRx3yizkFRawBveObvIsg== ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ba+DWqZ2DFPJiFkKoo+wZByr5R3xoHRtVgK97lbjjNM4qNhwkQzhIQtTrlRcjNjCUGDk7DecJkMSg+y0HEMqTRjCcYOrLDkGZxGggENFPb7ziy57QGzIagnbkBLjrourhEnL6G7B4yndLTzuGq5Iu3qy6O7J2MThRIotMcUwjZyuBmchMJyFcNvbKHcwJZnqsWo605yAHaYuGfCCFoSYpotJwRUga/Yfw1SiEmaFV2tX70vf2NZVXadWqs/yyxSvxmZepuroX/pQ0d0SUgk8/nQ1IhJEIRn4Tu6NEPzvjs0Uw+q4f9acGh5+t7C8IZ8SDiIoO0eshXvgl5zp5vAntw== 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=i319eQzVrMzWZgGm44SUMcldzNGFG5MMhuQv8ox8Guw=; b=J9tgENLSgIaZUMY/svwzfcxjh8TMTkCrCh0tvuPzBwQqKEEIgRogo4pmL7n/S5SQx1aKQ87GzzZgnHUFl16Fk9uEYq9K/BWY97rqDIS+R+UKa739MnI3q8Im4peTYtATXM/iilA4Uzzl9JwBo4DwvO0UQhgD5MTw1GN8EPBYKnee45fYzH9I+HdKSayPlRJ8IhcKyWjnG3+1RRElNHyBlxBxrSlVhBFYUuMm9K+aY9bmJnpqcJ8NHz1wcatmURtQiyBD0NDuZRTusuBFkBWz29AX2opuc8SEt3vlJZBIr/jnICltSO/dv0o3X56RRkozLiwemwQ5bxjmcsHV+DpHnw== 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=i319eQzVrMzWZgGm44SUMcldzNGFG5MMhuQv8ox8Guw=; b=gyxSK2mzkYmKPEthZ+ke/Iv8gZta+R0Wfreww9c+wYf73Cerq9O9vMHgJ73LcvTbz1BMND/FXNMSgUKTGW/iMOuR7OVkAS8QHkOk2b1o3LiXgAelzkux1EFsH/89KO5fHn77k7XGPzpquAyeuZEgCULaGx3HNcofeGKLk9pfTK5l4b4Wj5Y+OI7FbUEGhzPLYMKa29MJfyxWDfyJ394/R3dCmZAypyafMxf/MzVLsDWb/HYIhMZfnu1IdJ56MmEfpaa483XZIAsKGeCtcVaI3UGLmp/hEPT/D+jqfhdTBSv6v6oXzV/C8qBELC+ae/1Ddr0phzKV/zqi3LVqlFgokA== From: Het Gala To: qemu-devel@nongnu.org Cc: thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, peterx@redhat.com, farosas@suse.de, prerna.saxena@nutanix.com, Het Gala Subject: [PATCH 2/4] tests/qtest/migration: Replace 'migrate-incoming' qtest_qmp_assert_success with migrate_incoming_qmp Date: Wed, 10 Apr 2024 11:15:39 +0000 Message-Id: <20240410111541.188504-3-het.gala@nutanix.com> X-Mailer: git-send-email 2.22.3 In-Reply-To: <20240410111541.188504-1-het.gala@nutanix.com> References: <20240410111541.188504-1-het.gala@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PH0PR07CA0016.namprd07.prod.outlook.com (2603:10b6:510:5::21) To SJ2PR02MB9955.namprd02.prod.outlook.com (2603:10b6:a03:55f::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ2PR02MB9955:EE_|CH2PR02MB6791:EE_ 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: Z75nrkwnB9DDL1d7ifCnaId1UtIurbqSlGysXiBN4I7q7YY7BVU9aAqHyPh5QgWUHRKgjtBX8kPPvC4DOcsWM+3wlUhZ2sj792jQuipL8FGKNAo9d9SlH+wp+K6qDY7AxjqNn++mFEOSAtb+T2xBXUz8xWrewO5rIFbIUFB8WJH4bTSL1dbpf61x+B1t5ZGnRhWDtb6C5/vbw30WuUAGWDoT9wX6xBkVqrRp+eX1TwIWzFZP2Gpzn2GYjQoRjd61Ru2eWnf904eeCOEDDUy8JwQBbtvm2YQtgOXNx6V8BaHgVTC5BmvmRVeX6w3jXpkwTsdubyxGCvNoOoX5F1Zna0sFqyBWzyx/YAhOvCkKQqCV3A4onLm7n5jlW4MXheK7APhrn3c25nLz2LQZjL2xZK33MSELgwSReEYc8T4rLamMDcw26C0PyrPgvxrSHpi2H7Wu/h3iYLNWq+x/U9EpKR4sIKfRWJSyZqLOSxScNSSDBdOat9GIg4nFQVCa4nH4ZpMAIyNMmjUPl12W/5JqXP156dniKxmQyDPNQiaKsoBJPY8G7NbjBElVL/JN6J00bfx7SD79aUmeCjhqjSJ4EZZ7EWeLq//1lo+UCAXmVExx5HyB4cbxySJXU9dOHkYVepez7M9zVDNMDZvb4AgCCqfbNSZrcxnKXsySwkOirIim5F3POIMvYq41mkT0muguYNnpS9Z4NSipA7xG2ThijUCbrQrJXM6xSg9beGjKXXk= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ2PR02MB9955.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?kkXJ1+/cp7ESUBkr6/70bCrJjNmA+h8E37JhVboneboUVZDg9LDhMPy9F9U0?= =?us-ascii?Q?wMGt7vO5Roec9uvHNcgO3d6aWMS25bfmVmPbGRoTBaooU71KaiPM2WANPy+L?= =?us-ascii?Q?W6Xng0aizu2CbsSbYKXyWx2HlSjupWNpygNeIB3kV5HMFv0StIgebC7YD4Ea?= =?us-ascii?Q?wKDFMZxgJerlbYrcemqAUl2Cap6myoBzlR6FC4sR1l6r9IVwqnH+CIIxy8P1?= =?us-ascii?Q?AWRNA/h2tK8fcmAnt7eh6izcpGKXlTW0iL0xlRZCm3MOxvx9X7enjcAbUeD/?= =?us-ascii?Q?l+gDAQglTkAIigZ7QKwPO/2ebJ9G0eHxY/YAMAt/LnaqIrzH5Fftrv3Hpamp?= =?us-ascii?Q?H877mJVKm7zPWStCNIDVmuFBuiegMUCn6DGwtQ5kOXyI1B2AyFl2pXDmbcmc?= =?us-ascii?Q?HZXDSiHfyLGm9Jn26BTPbfY7D91mKB8PYT/d5qDM0l1bwQypvnY0DocBZHQ3?= =?us-ascii?Q?xPZYZrzD5M8X8BHW/d2XvrpgoGUw62xuEduRCcdMNhuPPPZuDWaQ9IGCh4XT?= =?us-ascii?Q?qx6dNroQYQX/+zMNrwFIj6UXjbLTGcv6E9Da1fwjGNpjykCk5hkfjAUlAMQk?= =?us-ascii?Q?x/Y0Eobu8nyyaZafvHD6TAG0MT4ZNI2Gh3zL9faqdq5FwLN5T7uUF33Xc5O3?= =?us-ascii?Q?EZ13UeI0JWJ1cavvb08awdJcPjL3Fd/TyunN70ThOITt6LgTbxJ9XmnzuEm8?= =?us-ascii?Q?2r6NHlD+ob8jrtir0reHf8PJ0xvfoUcZNEkDGsauPD18xQH1KoubBNR3iuTY?= =?us-ascii?Q?PwtZ3k7f2a7zowpiBVzsqHa197Y2qbOPyiDNOWs2ZRwSNf19YpG5kmBwC1ts?= =?us-ascii?Q?Vjo144BoVQXrSYp3OWpkVz+qk7aMSfnuABRfaZCsO2Fx/sfgyY7IU1v5k771?= =?us-ascii?Q?JrDidzRVjE2R9v+O8+HfBR6MLxZfrPWG0y+Y8AI3IGuQsNk0IRV6qeQ3keyG?= =?us-ascii?Q?bACnvWTKNOwzeAlalGAOqR/fi2n5VeRVLH9aMPpq/JYsWSbr+5/eQRXiF8Fn?= =?us-ascii?Q?wlNE2j63zkyDl7ZSOZd56Ay0FmjQbjbV1XmfrZ1HS0a9JrOwEdtXZ61BbabY?= =?us-ascii?Q?BLx4ld83sLfAFbDBxM9dOXxi0/Kl07xDVA5ZfNnjpilZLcVR9qUUsFfYH6UI?= =?us-ascii?Q?Pef+D8e9Q0E30YVThPGI1tZW1QC5m+67u0/It1y7FaJN/JMyboiRieY0TRDg?= =?us-ascii?Q?9T5I2/dT9B38OqbLzR3QHIpiA7qkYnk0XPFGspwQfaOr76KW1DltvKzOeTHJ?= =?us-ascii?Q?ZTxaBggOxBCk5gGYRgXOF/T3zCUGhnRfhdC0CdF9hbru2MZ/I84Yy8Vo2r/G?= =?us-ascii?Q?wPI0jkIEvntFsvPv4+GldB21DiXKUlz/p4DHl9xNzplgRQ7nBduNgTilX5N8?= =?us-ascii?Q?Gd2hUhhZp3dQsiWrkAL8O69/HTX+fcq9/TdT7Xe/ZnxcuZcZi7Z5sN/slr13?= =?us-ascii?Q?/tVxaAnKnTQF/bzzfbigu7NXFJzr0NuUdJUtap6/jv3CzFopTlEjp+dI4+y5?= =?us-ascii?Q?vozsuGPFMCC0ExsigxNz3woVtKcTtwZHj2a2ly3g5JS929Ys15Nc1wwj78oJ?= =?us-ascii?Q?mlT4rRfJ/xq/9QEfN9dHnfwZ4avhQ+r1vRSVbDFD?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51a1f9d7-8bab-45fa-2638-08dc594f956f X-MS-Exchange-CrossTenant-AuthSource: SJ2PR02MB9955.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 11:15:52.5639 (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: 1W6jDnfiNSaRpZtZ8flDEx5bebknR0pJZLCN6F7gGlGoZ3abcksKTkmsof6RrP4BxY78zgPtX2U2GSola2JSJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6791 X-Proofpoint-GUID: idOI-0jltp-Xk1deT2I6d8aedo1GO8R0 X-Proofpoint-ORIG-GUID: idOI-0jltp-Xk1deT2I6d8aedo1GO8R0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-10_04,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=het.gala@nutanix.com; helo=mx0b-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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1712747827019100001 Content-Type: text/plain; charset="utf-8" Already have a migrate_incoming_qmp helper function to initiate 'migrate-incoming' QMP command with some additional checks. Replace 'migrate-incoming' qtest_qmp_assert_success command with calling migrate_incoming_qmp helper function for postcopy qtests. Signed-off-by: Het Gala Reviewed-by: Fabiano Rosas --- tests/qtest/migration-test.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 27a1066ae4..f2c27d611c 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1296,8 +1296,7 @@ static int migrate_postcopy_prepare(QTestState **from= _ptr, migrate_ensure_non_converge(from); =20 migrate_prepare_for_dirty_mem(from); - qtest_qmp_assert_success(to, "{ 'execute': 'migrate-incoming'," - " 'arguments': { 'uri': 'tcp:127.0.0.1:0' }}= "); + migrate_incoming_qmp(to, "tcp:127.0.0.1:0", "{}"); =20 /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); --=20 2.22.3 From nobody Fri May 17 03:39:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1712747799; cv=pass; d=zohomail.com; s=zohoarc; b=GPyUsEIV56NrLVXxvTggtB44Xnk+RQqH8kUvwoDIbnQRbrTojE7OMnHORcXRNSszm2y6F7sx7Qbud52gp4NASVMMDsm78sxbR0VpJ8TIY//he3Xrsz2URnXWMOIHY3MfDAvvPwFJsiTia01Q6s+s08WTXoPPw7ieuYZ5NG0+WdM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712747799; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=iYRHkU1wThujbv/fRf6aDTYD/3SJveNk0Rs+Of/+2fA=; b=Xd1wdDfI0yyuOsNWiKrbXuCtOtlr4BmQEYhC0xCgq0yuQjhS9T/ZR7v5WIo5cGfkhE62DMSsEFgYHNgW5H39ZrmHnNhaL4HLkRlkbIUIlI3RbdHdnWwNP5YhDdkSm9Gnqr3zPeKu3npNCw/RiC6syarVbUShdhipHIOU8yuDOnM= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712747799781825.5582808169081; Wed, 10 Apr 2024 04:16:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruVvu-0007Uf-IC; Wed, 10 Apr 2024 07:16:02 -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 1ruVvs-0007TW-Tt for qemu-devel@nongnu.org; Wed, 10 Apr 2024 07:16:00 -0400 Received: from mx0b-002c1b01.pphosted.com ([148.163.155.12]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ruVvo-00019V-UF for qemu-devel@nongnu.org; Wed, 10 Apr 2024 07:15:59 -0400 Received: from pps.filterd (m0127842.ppops.net [127.0.0.1]) by mx0b-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 439LN4vB015436; Wed, 10 Apr 2024 04:15:56 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2169.outbound.protection.outlook.com [104.47.55.169]) by mx0b-002c1b01.pphosted.com (PPS) with ESMTPS id 3xcvwy2v5y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Apr 2024 04:15:55 -0700 (PDT) Received: from SJ2PR02MB9955.namprd02.prod.outlook.com (2603:10b6:a03:55f::16) by CH2PR02MB6791.namprd02.prod.outlook.com (2603:10b6:610:ab::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 11:15:54 +0000 Received: from SJ2PR02MB9955.namprd02.prod.outlook.com ([fe80::225c:2edd:87e:7cf0]) by SJ2PR02MB9955.namprd02.prod.outlook.com ([fe80::225c:2edd:87e:7cf0%7]) with mapi id 15.20.7409.053; Wed, 10 Apr 2024 11:15:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= proofpoint20171006; bh=iYRHkU1wThujbv/fRf6aDTYD/3SJveNk0Rs+Of/+2 fA=; b=sCYrpJoNXiHUTiJJFE1A9UpBLbeWBgjkyMmGjAG7lj2VlERkoL/tvAjuU FhCOnJR6R5nItPP6C8Ih9hpu8qBZwGDAD88D2jrvspjzXPb8jG6wA9ikzxKfc9hH vVE+b4MfB2RBJe82d/9enEkugS5njboTmu2fvgtF4RZWiFOKZ+B4Xx08yZkDtOJX 4NIvFe0yA4Ak/oD4Y8MXGquDzcrn2JZSYjQIhuYhy8O34yEANRnz9Fa4tLfLt9Tc 3VHp+fABap34lGAbp62flPuw5RZgwzc5hs8Q0c9UTwZaD1oe0hbvo679pFgmmTKU 0DfUBMycDmIliWgDdh78nFHnlIOQA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LolK81BmEqbPARMZrrJuK8Arj7N+VuICMRud5sPCcJMwmjF9r1EqRZq6NbWQQEyf99KRGyXBbEi+7RjcNFQBFP3yrQ+rRjrfDHA2a2yRzxyf2N3I2eIOB+jAwMKRDLDobPFpPqh4md++WtKq96uGJfLIUD+B/TURG2ZKnuh3aEezEyqdmyumuSi2heisL8PUxrbsK166Eiz+DQDFRKgCdG/hedoCeCJXQUkEsfQltrpSUcE0lkKmyXKlBoqBR7FXESAyRNYOxPxW17jDiGYYsdEFLrJ2K6v/QbGJ7lUnateoKqkRZg52Tc2D6PZhVzHPsVDSbGcg549c6d6BkZz9OQ== 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=iYRHkU1wThujbv/fRf6aDTYD/3SJveNk0Rs+Of/+2fA=; b=K/CskzcwDc359bzrinJEjOVJD2hDAxPYaA6U7yQ2lHmkBsCfYlX6YhzyoFyuLnY65quRnTGpY2Tc/yblE2ow8zBetD18WDyTE3hgm/Ty68LvNAE5CW/cT6ogvYvb8lQI0paqhC6IcMKWVOYLrx/Oe3LQPL6M9jbqk2Qh14feYs7DNc8tqDRulbC/WwIigTijGEnUbWbqOH4SZ8rebrBFNIPFgqm0LqzBenGw3gMWWGvDzEt3hi8j7RXtbSGHGClGOJiqXE+AIPoxvolDdDyJH79lgwRjzuBIAsAZNkAFvN31B1xExruzkV16pwKA954MYWU5L7+IKG+aZXC9J7eQaw== 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=iYRHkU1wThujbv/fRf6aDTYD/3SJveNk0Rs+Of/+2fA=; b=wyzVfXVjEeugb19WTyrL8VEqHjPOD9s0yleX1rA1dQkTNDByzno4sBGRB6ls8LZpbFZrjinajSSYPJ4/4hvOKhHmJFRNaDMJINTQzRb1Q7P1BrcwWpH1iDbaVIi50s1pP2PGas8Yc9pl8F5TGRyDUpLe7no0i0gUqiFR5dZznYize54dZpHggRh5x27EuMWu4ZXqFO7iND0uzew5IbmLvYXT5VGgNmE+WL6T2Bp1BP6LNjZ2+wvQjA0SPT9iFlf6N9+7N1BOy0T3d0HqMxUjZ3um6dlKE6375AALtfju3grXepE7d16eNCp25jcFiqWBiujXslWL8dVHWXp1BUTOZw== From: Het Gala To: qemu-devel@nongnu.org Cc: thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, peterx@redhat.com, farosas@suse.de, prerna.saxena@nutanix.com, Het Gala Subject: [PATCH 3/4] tests/qtest/migration: Add channels parameter in migrate_incoming_qmp Date: Wed, 10 Apr 2024 11:15:40 +0000 Message-Id: <20240410111541.188504-4-het.gala@nutanix.com> X-Mailer: git-send-email 2.22.3 In-Reply-To: <20240410111541.188504-1-het.gala@nutanix.com> References: <20240410111541.188504-1-het.gala@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PH0PR07CA0016.namprd07.prod.outlook.com (2603:10b6:510:5::21) To SJ2PR02MB9955.namprd02.prod.outlook.com (2603:10b6:a03:55f::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ2PR02MB9955:EE_|CH2PR02MB6791:EE_ 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: fd/uxUUh1EQIqAmWZ5EgeXAME1bxY4/SSt/q4PXetgcfaFx2UA7DjPWCPauMed6jzryNvwzwqbR7KFvWKy4qPtWK8OMi4PznbajFTv+P3XiEspuoaM75ZnNDwpI/N1NI1lxjuveEM+uUn5pRPpqhFztTBGwMRFiXMLREauw598ZNB8NnrTasRd0zKkhdsuk/K9erfBB2syLin0585h9WkAS4Fo+J3H2NWTpkNYpQOF/IlcsputlWw0F0bDKdN+/hoiPSndcrDu86mIoDrdFMZunkVMH/pRkkP7UU7/E/WOD7fq9ytRKHofAuuLk7sUToPZMGg10tOXPMbAMna2dRR25/KKOvHiW4iG+1eBiA/nFLzykjfkjeVlYj4XsNMt6Y4KnMR2FIbYEIkHCuncwDcJQ7iQwCGA6bld/YqZkGHKb8lEiGIZXuYDQTZtW5DWZLDUvnXG72jxvA3ufecJbNGINfzZj8s5LG52qmzOqTLyFAleSk84HS6KY/G9SK9lIsX8+iz0L2pnmQUzhgfBBOKHnoTkAmpNcW3CzQ5eHwic2exF4PzXF0kF/gOS6yecj762Rv52gTAkv4bL6fi8Ei7deCAkHRVtLUd7medRDTMtsljhL0D4SWVIL59/cq05v4uk9OycghyB5XOy6ptf6BT1NyqmLUf48ArKTKDFCkFlXVhYQYkyYQiPBY+3i6T1yJSZpMd/kdqgLO2I61ayI7TD7pIIvLyePYi9DtV54teEg= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ2PR02MB9955.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NnbSt8js8e7yHDZydK6Ygp36cGKKVal4FqgbGrhXK2Ijo8ovX2vfrL5AgMXh?= =?us-ascii?Q?BPmCbk2nhhSp/7IIe/kWw5IAcEJ1alV99gbv6XM9geD1Nbqf9HNbjaw3F2+l?= =?us-ascii?Q?w/oQltmHTDOas6sd3QeFWzBFi9U25N1MZ/sBrEYqXBgkP50U7YLEpSK/ZYKx?= =?us-ascii?Q?5OlOzINCljg4WcqwejxkXyqHvMTDEx8Or5axONJf/FI+VKM5Y5sc2YFOLock?= =?us-ascii?Q?y3SRUtJ+6B8swv5SLxCI2HmZ8IW2DtN2Jz7QYofdYNjconrkOOObujGzBKab?= =?us-ascii?Q?PdOX2JhduaGDvAES7u3KkPNr9Krd1AJnRqiIZbRGMtWWQSXhaJ3rDElYHHLn?= =?us-ascii?Q?V4KjTDQlGYxPQkpdMGI+PsYSjo0bmRzkC0Uh/z+2+DwfORq1bCuh2D5raK76?= =?us-ascii?Q?L0BtQaKBJv40yGgOjlRuFwSrzV/JB9Z83UJvv8BoUHqVxsLd26RX6AlZUai5?= =?us-ascii?Q?bbG9etIPVOmS5nu/rrEVlysNBqRjcsXdjDsIe1ZsYlrtrzbTwDZdkZyA4SSv?= =?us-ascii?Q?Y8wJGppuSsPnxUBNnMeMJwC8Vgdmm+sQj25bqrsZdlxhfIdIUFGRsWg9hp2H?= =?us-ascii?Q?kErfBfwKooCXSz+aClZ5Qhn2aOoF3LZgl6IQ63toTDmNntUyHxacGGXC+5X1?= =?us-ascii?Q?cQ1cPKsjUfU1mg17ZqQviR8LE8TpqrFYpLXeRhvAwkEo/jyX5Usbooss0TaH?= =?us-ascii?Q?xoFTRLUG+ZZhPeFKrXmPySJUgupO9LdJ2paCSR8CFNyEqlPVX5+UjGCrvkXM?= =?us-ascii?Q?U5VBH4uxbD5wBYk7ahOlh4p9siMaBlTFmD332ZAGCxA6wiBEhGV4ZdaW+T52?= =?us-ascii?Q?Bf8eNZvYy+D6oMwXQjmV3RLlYL8Q/95yoiqmyZeYzAo8zXOAhPuSJ4RxcMBL?= =?us-ascii?Q?9bMIDPuGWOKprVzPf1K9gEeOOn+Lb4CHSRB/9X7dATxD9F0iTw+z/sJzy0ke?= =?us-ascii?Q?6DtUTl06Q/Q03GTcpL+MmqtS0rElUIgDUUlqqDr/9LU9oF35VHpnu0GBltnd?= =?us-ascii?Q?AWwyPioEEp+/FIm5fvO2gn7l0DBPhnXbb6x+MMt3loqJa6VXBW70ND3Si7ZB?= =?us-ascii?Q?eBD3zLlyr/dBRKiZlViLNIG/jp+0zS0lKbr9zxJXjS7ng9pZrpYd7T7euVUI?= =?us-ascii?Q?irItSJZR/IlkC7fWaSbvY1uAny+kMGkf0Vg6DYtVFmKYlJjDkTzibcwJ6oFs?= =?us-ascii?Q?p0Nypi8ycIiV7g5DvevSfVKPYHC7uI4675hGr8pzVuK/31z2hn6S665kBY7q?= =?us-ascii?Q?jAHfDYtD24KHDjLOe126AKU5+e6TXw0mefn02MzIdw4JJhbZzRba+JlBBovf?= =?us-ascii?Q?rSNeOrYU/GLgYJ1nJE2+SOdIMS9BPeQ1JmntYtUISPHMxYvioWz2+q73xqXJ?= =?us-ascii?Q?G5SysX++K5r3ysDJNIJqzt8VI/rcHVOOZ64vmuhgLsPkC2rrlE4Cez+eIT2s?= =?us-ascii?Q?XhdGmSV6oTqWiWzP6p2OLXIx9KUvVwXUa++Nlryh7NCxAkD8rDoqRfQKLClf?= =?us-ascii?Q?TE1O0gdBLMlSFCtle+kOXwMb7pVXsFkFHQ26A3gCcbNexZ5bBbYcquPeelEp?= =?us-ascii?Q?Nfx/lo+iEmWlAy13fgYyEJpn3T5rRfBJbHE1GeA/?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 889f0aa2-911b-4c1c-1589-08dc594f9651 X-MS-Exchange-CrossTenant-AuthSource: SJ2PR02MB9955.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 11:15:54.0028 (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: kA+jDGcNqNd1ZHZrkDa9woGdzXt6A7QUT+NWpRhx3kiJamA/h7ERb2LQXF/zdaxnBPu0OR2shuVn2WgUwA/6iQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6791 X-Proofpoint-GUID: 9mJDxOkyM0BVEM8v5XuWhAbgj5FYtkqU X-Proofpoint-ORIG-GUID: 9mJDxOkyM0BVEM8v5XuWhAbgj5FYtkqU X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-10_04,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.155.12; envelope-from=het.gala@nutanix.com; helo=mx0b-002c1b01.pphosted.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, 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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1712747800925100003 Content-Type: text/plain; charset="utf-8" Alter migrate_incoming_qmp() to allow both uri and channels independently. For channels, convert string to a QDict. Signed-off-by: Het Gala --- tests/qtest/migration-helpers.c | 13 +++++++++++-- tests/qtest/migration-helpers.h | 4 ++-- tests/qtest/migration-test.c | 12 ++++++------ tests/qtest/virtio-net-failover.c | 8 ++++---- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tests/qtest/migration-helpers.c b/tests/qtest/migration-helper= s.c index 3b72cad6c1..cbd91719ae 100644 --- a/tests/qtest/migration-helpers.c +++ b/tests/qtest/migration-helpers.c @@ -245,7 +245,8 @@ void migrate_set_capability(QTestState *who, const char= *capability, capability, value); } =20 -void migrate_incoming_qmp(QTestState *to, const char *uri, const char *fmt= , ...) +void migrate_incoming_qmp(QTestState *to, const char *uri, + const char *channels, const char *fmt, ...) { va_list ap; QDict *args, *rsp, *data; @@ -255,7 +256,15 @@ void migrate_incoming_qmp(QTestState *to, const char *= uri, const char *fmt, ...) va_end(ap); =20 g_assert(!qdict_haskey(args, "uri")); - qdict_put_str(args, "uri", uri); + if (uri) { + qdict_put_str(args, "uri", uri); + } + + g_assert(!qdict_haskey(args, "channels")); + if (channels) { + QObject *channels_obj =3D qobject_from_json(channels, &error_abort= ); + qdict_put_obj(args, "channels", channels_obj); + } =20 migrate_set_capability(to, "events", true); =20 diff --git a/tests/qtest/migration-helpers.h b/tests/qtest/migration-helper= s.h index 1339835698..9f74281aea 100644 --- a/tests/qtest/migration-helpers.h +++ b/tests/qtest/migration-helpers.h @@ -29,9 +29,9 @@ G_GNUC_PRINTF(5, 6) void migrate_qmp(QTestState *who, QTestState *to, const char *uri, const char *channels, const char *fmt, ...); =20 -G_GNUC_PRINTF(3, 4) +G_GNUC_PRINTF(4, 5) void migrate_incoming_qmp(QTestState *who, const char *uri, - const char *fmt, ...); + const char *channels, const char *fmt, ...); =20 G_GNUC_PRINTF(4, 5) void migrate_qmp_fail(QTestState *who, const char *uri, diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index f2c27d611c..fa8a860811 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1296,7 +1296,7 @@ static int migrate_postcopy_prepare(QTestState **from= _ptr, migrate_ensure_non_converge(from); =20 migrate_prepare_for_dirty_mem(from); - migrate_incoming_qmp(to, "tcp:127.0.0.1:0", "{}"); + migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); =20 /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); @@ -1824,7 +1824,7 @@ static void test_file_common(MigrateCommon *args, boo= l stop_src) * We need to wait for the source to finish before starting the * destination. */ - migrate_incoming_qmp(to, args->connect_uri, "{}"); + migrate_incoming_qmp(to, args->connect_uri, NULL, "{}"); wait_for_migration_complete(to); =20 if (stop_src) { @@ -2405,7 +2405,7 @@ static void *test_migrate_fd_start_hook(QTestState *f= rom, close(pair[0]); =20 /* Start incoming migration from the 1st socket */ - migrate_incoming_qmp(to, "fd:fd-mig", "{}"); + migrate_incoming_qmp(to, "fd:fd-mig", NULL, "{}"); =20 /* Send the 2nd socket to the target */ qtest_qmp_fds_assert_success(from, &pair[1], 1, @@ -2715,7 +2715,7 @@ test_migrate_precopy_tcp_multifd_start_common(QTestSt= ate *from, migrate_set_capability(to, "multifd", true); =20 /* Start incoming migration from the 1st socket */ - migrate_incoming_qmp(to, "tcp:127.0.0.1:0", "{}"); + migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); =20 return NULL; } @@ -3040,7 +3040,7 @@ static void test_multifd_tcp_cancel(void) migrate_set_capability(to, "multifd", true); =20 /* Start incoming migration from the 1st socket */ - migrate_incoming_qmp(to, "tcp:127.0.0.1:0", "{}"); + migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); =20 /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); @@ -3068,7 +3068,7 @@ static void test_multifd_tcp_cancel(void) migrate_set_capability(to2, "multifd", true); =20 /* Start incoming migration from the 1st socket */ - migrate_incoming_qmp(to2, "tcp:127.0.0.1:0", "{}"); + migrate_incoming_qmp(to2, "tcp:127.0.0.1:0", NULL, "{}"); =20 wait_for_migration_status(from, "cancelled", NULL); =20 diff --git a/tests/qtest/virtio-net-failover.c b/tests/qtest/virtio-net-fai= lover.c index 73dfabc272..e263ecd80e 100644 --- a/tests/qtest/virtio-net-failover.c +++ b/tests/qtest/virtio-net-failover.c @@ -772,7 +772,7 @@ static void test_migrate_in(gconstpointer opaque) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - migrate_incoming_qmp(qts, uri, "{}"); + migrate_incoming_qmp(qts, uri, NULL, "{}"); =20 resp =3D get_failover_negociated_event(qts); g_assert_cmpstr(qdict_get_str(resp, "device-id"), =3D=3D, "standby0"); @@ -894,7 +894,7 @@ static void test_off_migrate_in(gconstpointer opaque) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); =20 - migrate_incoming_qmp(qts, uri, "{}"); + migrate_incoming_qmp(qts, uri, NULL, "{}"); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, true, "primary0", MAC_PRIMARY0); @@ -1021,7 +1021,7 @@ static void test_guest_off_migrate_in(gconstpointer o= paque) check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); =20 - migrate_incoming_qmp(qts, uri, "{}"); + migrate_incoming_qmp(qts, uri, NULL, "{}"); =20 check_one_card(qts, true, "standby0", MAC_STANDBY0); check_one_card(qts, false, "primary0", MAC_PRIMARY0); @@ -1746,7 +1746,7 @@ static void test_multi_in(gconstpointer opaque) check_one_card(qts, true, "standby1", MAC_STANDBY1); check_one_card(qts, false, "primary1", MAC_PRIMARY1); =20 - migrate_incoming_qmp(qts, uri, "{}"); + migrate_incoming_qmp(qts, uri, NULL, "{}"); =20 resp =3D get_failover_negociated_event(qts); g_assert_cmpstr(qdict_get_str(resp, "device-id"), =3D=3D, "standby0"); --=20 2.22.3 From nobody Fri May 17 03:39:16 2024 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass(p=none dis=none) header.from=nutanix.com ARC-Seal: i=2; a=rsa-sha256; t=1712747786; cv=pass; d=zohomail.com; s=zohoarc; b=VD0/u424jfXwYdF3MrIxyjPpOUUKMpEKpFJywGgqbRMrtzDzgYQxdfTMLjOQLyyLzkYsUL8Csuak7LqrN/P6gnr9TIHZbCbHwWKEBBIju/Iysj8SYqdd3JDhx+PP9jVRbNbliXwqHMIyEzJkDfFsxmdbaz0DyJ+O47iR9rrgHTo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712747786; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7qHqbJfn5gnM90KtpxfzGdSaq2WuFSsucG9/+bwPkwA=; b=lQdxuPBenflPilCXbHNQK3C1GN5TTDN0aOXBTJoV8wiwAXDCPPPXCr/4faiu46P+50INVFu8P9w4APFxz53+pCrPGuJGl2rWkm2+sUmm0IxgT/jKCmLuK2snLBry/dleP8f0vB0I7StNFQQ5iLXe6Ut6POVvE5n0dbh02EitzSg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nutanix.com); dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712747786573540.9866498494722; Wed, 10 Apr 2024 04:16:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruVvx-0007Y4-5I; Wed, 10 Apr 2024 07:16:05 -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 1ruVvu-0007Ua-3g for qemu-devel@nongnu.org; Wed, 10 Apr 2024 07:16:02 -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 1ruVvr-00019d-IJ for qemu-devel@nongnu.org; Wed, 10 Apr 2024 07:16:01 -0400 Received: from pps.filterd (m0127837.ppops.net [127.0.0.1]) by mx0a-002c1b01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 439LGv17021052; Wed, 10 Apr 2024 04:15:57 -0700 Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2168.outbound.protection.outlook.com [104.47.55.168]) by mx0a-002c1b01.pphosted.com (PPS) with ESMTPS id 3xd1qtahad-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 10 Apr 2024 04:15:57 -0700 (PDT) Received: from SJ2PR02MB9955.namprd02.prod.outlook.com (2603:10b6:a03:55f::16) by CH2PR02MB6791.namprd02.prod.outlook.com (2603:10b6:610:ab::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.46; Wed, 10 Apr 2024 11:15:55 +0000 Received: from SJ2PR02MB9955.namprd02.prod.outlook.com ([fe80::225c:2edd:87e:7cf0]) by SJ2PR02MB9955.namprd02.prod.outlook.com ([fe80::225c:2edd:87e:7cf0%7]) with mapi id 15.20.7409.053; Wed, 10 Apr 2024 11:15:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nutanix.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= proofpoint20171006; bh=7qHqbJfn5gnM90KtpxfzGdSaq2WuFSsucG9/+bwPk wA=; b=t5TytN9nBzgjSGkmzNL7yxvieVvv27nQu4p8BRPQc/wD/l/IY65wkJ+8d GKthnIinzpdztDtmnGLRmp3h+RGrqTT50+T1Awd8qElnB6ssigZmEiuZDAExYUG9 kg5BvxgyZ4bh574ysF6Ayri3sTNaYfhRgGHheDS/GBmHsBIbvPXYXKan+hxamKNr gWaUDcPRFd7P7IaBsMRvrNwyoErgffmwDzc0oTf3jZ03bGh3eLIYjrzsIixi0Ync plFpLSmDbdf2rK2M8kMyjCtgHA2Fqb4UEzBTbUOGwe4s/nxqv2aW28FoyTbNJwJL o9P2M+hpgcx7eCM5ldB4uuC/qzLRA== ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oKktYPfeUs908Og5RVKjNcTVWMXFumPEvuuEN9GSq2aD4nRlgV4bo47Nd5EQtgLbeZxRFTQJ94VFY3oL290tj6etZTnGl79WuTMJ6oXpLtcK4pgElTXS7r6iSI87xmCQ2jzhB4as7CfxxVQKQs5zkypSsAop07C7VLhhDMS0NDDRyJnG0AWpRK3rh27ULyP3tk66ZDPNxtucOMxBEYp9/PIcmKVt34fSDm0KUV0ptIEgFDBCfaTwhsIHMYVJ2GzGu2/LNlZEytK/zioQ9jMkznYwp2lI+4RBr2yxrAyq9p6vJlb7goFBm+ODoPUa8SWjWpUAwrwaH02Uto6Ef81GMw== 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=7qHqbJfn5gnM90KtpxfzGdSaq2WuFSsucG9/+bwPkwA=; b=f5x0dAOoMAAZa3iTgDYH7QrC/56NxXHKKe7nWiXd7bnfiDSDq7AhF51ZvY+aEJX/sbYtC08jtjCbqv2qXB+FKFJiqiAAHzUOK1vTS4nBQ9NvkOubrEJB2smytX66j+JPS7OdxJ1INyF+X1rFktnLqt9vp81DYSKMj/L4ynT17TyjTzTn3iBqtTDjV4R6bXe++zeRLxPE25ZF46AkD/jepxmGhjynZKvAKoVjYHq9IHZkxzIb1uDCVx1SAzAfcW9ey5aTupYitSqvccmHPKErJ7EXobBDFHmZ3lEw1Du9RkF2wzLGSmKGKYCcZEuBWiv/hPqwtO7l7a2Tz9TplV1UwQ== 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=7qHqbJfn5gnM90KtpxfzGdSaq2WuFSsucG9/+bwPkwA=; b=c6APTveJTUJe03h2vf5cJCkjOm0AgJxNvfKNQJC1Go/pMfrTe7joRwaT61xITowB+6Fo/YmjsNMxDSdKuH3qpgk+GXeEsXTXSr5q6GZ/n4hyjnhald2Cq/2RLeR3H0Pbt0k3q0j12IJMWqwUzc7NtPi59NQXKv0jnbBMreRiJcM4DZzdRUYUrekHwMVPneIg9yv7HWUqAvToa2HaYKSk9dHB/Eq4TSeuN5QUSS2IHjyUbNKU5uEnc6EiA4CBBgxodljZEx/sYtd9hHDpk+sDyZioLRsSVFzFO4RnHgRzSSBiqrxvEUigjsWQDlV1mxfct45niV0WW4wH7ntgMhLiGw== From: Het Gala To: qemu-devel@nongnu.org Cc: thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, peterx@redhat.com, farosas@suse.de, prerna.saxena@nutanix.com, Het Gala Subject: [PATCH 4/4] tests/qtest/migration: Add postcopy migration qtests to use 'channels' argument instead of uri Date: Wed, 10 Apr 2024 11:15:41 +0000 Message-Id: <20240410111541.188504-5-het.gala@nutanix.com> X-Mailer: git-send-email 2.22.3 In-Reply-To: <20240410111541.188504-1-het.gala@nutanix.com> References: <20240410111541.188504-1-het.gala@nutanix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: PH0PR07CA0016.namprd07.prod.outlook.com (2603:10b6:510:5::21) To SJ2PR02MB9955.namprd02.prod.outlook.com (2603:10b6:a03:55f::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ2PR02MB9955:EE_|CH2PR02MB6791:EE_ 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: n2Z0wYRto0IUE7yjEw/1bT9rdSQFSIY9RCFjZB5IZ7Ri+AJi+gpj8waLY0gSm44rF8AB95QWdEvRS8GVaHZOiDu5SZVIOyxyg4G27tN79y86A7xN98xQzhgSrFrt9qRaru3fsRrH6MtFwRAgBQ+wM+G5lEHZoPZHMrA45OGATwfU5TUp0I+xLZq+grWox0bXfQhfX0TWtF/E0LcRNLFjpHXI+IsNHP9EPAtcAXPj/SdmOaEhRcBI8tzWmYhpUyM61DGNGsdzKnfjuBDbMH/m77wQ71fERKqdTflqpjmqV05KC6z8NHNAo/IMsoPSDmD8ON6aeKyrbM7OqCFkgMPOLCe7NJgTKWkJtKIDjUgekbRYdKUuZtsRtmjLzxxoZ6D9b24r+KVDmwOJml0S3upa6zOYVemutyznv7cON9YsPlWIwvCUkOnwpnP8i0trHJB4UGkG9ySCU2lhWkusQaVjWfGTrvYz0EuSD26GVtSZSjnYGrkNl9i3giatFszAvn/pWiQjjKY+wl7G4tNg4tmYB8Gd+gl/LWEfu0icdTuQNat5ZIjY2On+ywTukl/4vdqRkBE7Nx9RVpaRgKuJ7YviAme7KljUQmtlSYeNdmqUWCgTp0cCHcAurylXk6hdDY+11iCBHEu3cYwruaa0pirubo6VrHV0JqIt2ubC9R26mLgsiMzEAtWiqeuPyuy964QUPhQ4LWFRENZjyZFycVcvsXji5GYX6FJzFfde5DBN3X0= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ2PR02MB9955.namprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(52116005)(376005)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/ZN/6ikEUlDGQhiHKUN0DGl2fTKankyEOzqAAfdwTevVR32KAwOC+BjMODiq?= =?us-ascii?Q?JGJ7/216xgDkZ6+/2+I/AbTI6N6sEHBy/ttNcSUz4OwTiYgxENscJCjiEc6a?= =?us-ascii?Q?PPXclrYNgeCfReqbKKuU6pAAuYaHw5NCVY0J3MHTqu/6+iU4um3wejPZF1t3?= =?us-ascii?Q?yYnoLb6bagnxCuqg/kWPnw4GcgGBB2xtv8ejHH9o0ojagUpGQbUQ3zwq7oB3?= =?us-ascii?Q?5JzwYdAXyWYJWMG+neUYjGd9ShRTDe6djxZDn1JaxLe4t1yIkaRnX7WEd8Wu?= =?us-ascii?Q?xaMN4YRuHiHk7gQbfEJzQPNTlKB9Zb+Dd/5wG9IDpVOAI5O5Hg+j3/YYlhNW?= =?us-ascii?Q?6xJdzo35OwTU5n6REk9omjnAKQCqAQiMMPAX5Bd+hKmnUVQRXk/DWkMY2DUB?= =?us-ascii?Q?iFYAH4Qy3O4nopaxlDI9a+SAWrkVTUYpzJkj7L2d0qw1ZoFdPQvAWhgN4xAK?= =?us-ascii?Q?0HNqZGTqLmzPV3/qP3APUPYwcJ/aVTj3LNjNff6YN59ciROAZYHx+ZS8P8KL?= =?us-ascii?Q?0vGAqwhXlujeGwtMWY0PilZvJYIvqgIlHTiRB+/cdTLl284ZtzCZuiBKUv+w?= =?us-ascii?Q?PIDs1wI/VT6spOzWGltllr3jwdVqL+5mrs73iBjy1IqLy74NVKTmP1NbI9Qi?= =?us-ascii?Q?C0J5BfEpPlu4ZTXICeyK8MALzvFNUzt4nQ8I4LJJjBzmwy5L9vKhHACFZSGH?= =?us-ascii?Q?n+cYiFwDhf1eC7yZMgX+XzZQShWap6eGXKM/38BT4w/BznWLmnrOqktPBJyD?= =?us-ascii?Q?PZm3Luis4cA7tEMCXsF9SYUZHmotPKg+mXwB2g6dMZ3irkel3tDCbbS3v2+M?= =?us-ascii?Q?YK9tMX9xE8tE00HYH3RltOju8u9+sAn8z5c3Pbk+yqIxytOYjwnNm1V6Tzga?= =?us-ascii?Q?p0kesAR4CoWymQ7w1gledOMSwWUX9kKpocouBESp0oqlRVaH9rC1c+lJmj2E?= =?us-ascii?Q?IKx7H5VBFqjWoWLT9N6kOCcEaZkCbbQV/KXIzDkMSVxLiaDTHDZ5DJx0O23l?= =?us-ascii?Q?FhVevVBwlwwskI3uFpNSCMbA8jNTAf6YyKqktE2JzZRzxbho9ZcIuyv8oA2n?= =?us-ascii?Q?n6M0/oc/H3snhhg+5TvQcOweD1QPtq58lucWdQEFjvtqd+iYDF1IaJ2gpaT0?= =?us-ascii?Q?Z1tY3hQCV0T/4eBhmHr4wbqRUYuJ9np/KPcGAmDbfQIbez2KrT0x3KBjwmR6?= =?us-ascii?Q?yWsiLmkr28k4dBUgYfX5XlDx0pf72VHaMKKYOaUh6RZ/8hnQBtmuDbd0rtbp?= =?us-ascii?Q?EMaWZ/bPZSYjSIHCeUTJreiJFjiFOJ1fqp+JYDelY1MwmJJ6QohxSCtw5guM?= =?us-ascii?Q?mTB5468PZZGH1VSpsOXbGBHX0TxjdKbLDpypAO6LpzQ/H9iPKeHQvBSWpXhZ?= =?us-ascii?Q?swifCUjeSNZq8tD/m2CB8Er4QK5DA1AMocGdOpeGe86wujsMVTgtxv6c6TGB?= =?us-ascii?Q?+KyAFN7gOwLstby6CxBAsHkkLyP0f6sj7rAPet75wVJAyQd3nJB5yUbsvigR?= =?us-ascii?Q?MaXpbKLP2Lv97cQWqwizgIeVBk1IaMmKAfGDb4HNDpB3RUryoqVeeuHomnK2?= =?us-ascii?Q?g4s0PLP2Atov++GEmI+55B/vrl3vRAfzCAc4wLzE?= X-OriginatorOrg: nutanix.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06960f7e-a3c1-46fa-fac2-08dc594f9720 X-MS-Exchange-CrossTenant-AuthSource: SJ2PR02MB9955.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Apr 2024 11:15:55.3796 (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: SAo0oQsskTpZ2xvwNMCgUVslvkuiFz3cSj2wdGxRb7i/s2GBhvVrYTnwhWNHxhfrb7newHHbqyRmbk7siGGoSQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR02MB6791 X-Proofpoint-ORIG-GUID: nzbrNd50ToTzni-H3A0R7uTUTZz6Wxbu X-Proofpoint-GUID: nzbrNd50ToTzni-H3A0R7uTUTZz6Wxbu X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-04-10_04,2024-04-09_01,2023-05-22_02 X-Proofpoint-Spam-Reason: safe Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=148.163.151.68; envelope-from=het.gala@nutanix.com; helo=mx0a-002c1b01.pphosted.com X-Spam_score_int: -40 X-Spam_score: -4.1 X-Spam_bar: ---- X-Spam_report: (-4.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.049, 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 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @nutanix.com) X-ZM-MESSAGEID: 1712747786915100006 Content-Type: text/plain; charset="utf-8" Add qtests to perform postcopy live migration by having list of 'channels' argument as the starting point instead of uri string. (Note: length of the list is restricted to 1 for now) Signed-off-by: Het Gala --- tests/qtest/migration-test.c | 38 ++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index fa8a860811..599018baa0 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1296,13 +1296,17 @@ static int migrate_postcopy_prepare(QTestState **fr= om_ptr, migrate_ensure_non_converge(from); =20 migrate_prepare_for_dirty_mem(from); - migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); + if (args->connect_channels) { + migrate_incoming_qmp(to, NULL, args->connect_channels, "{}"); + } else { + migrate_incoming_qmp(to, "tcp:127.0.0.1:0", NULL, "{}"); + } =20 /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); wait_for_suspend(from, &src_state); =20 - migrate_qmp(from, to, NULL, NULL, "{}"); + migrate_qmp(from, to, args->connect_uri, args->connect_channels, "{}"); =20 migrate_wait_for_dirty_mem(from, to); =20 @@ -1355,6 +1359,20 @@ static void test_postcopy(void) test_postcopy_common(&args); } =20 +static void test_postcopy_channels(void) +{ + MigrateCommon args =3D { + .listen_uri =3D "defer", + .connect_channels =3D "[ { 'channel-type': 'main'," + " 'addr': { 'transport': 'socket'," + " 'type': 'inet'," + " 'host': '127.0.0.1'," + " 'port': '0' } } ]", + }; + + test_postcopy_common(&args); +} + static void test_postcopy_suspend(void) { MigrateCommon args =3D { @@ -1555,6 +1573,18 @@ static void test_postcopy_recovery(void) test_postcopy_recovery_common(&args); } =20 +static void test_postcopy_recovery_channels(void) +{ + MigrateCommon args =3D { + .connect_channels =3D "[ { 'channel-type': 'main'," + " 'addr': { 'transport': 'socket'," + " 'type': 'inet'," + " 'host': '127.0.0.1'," + " 'port': '0' } } ]", + }; + + test_postcopy_recovery_common(&args); +} static void test_postcopy_recovery_compress(void) { MigrateCommon args =3D { @@ -3585,8 +3615,12 @@ int main(int argc, char **argv) =20 if (has_uffd) { migration_test_add("/migration/postcopy/plain", test_postcopy); + migration_test_add("/migration/postcopy/channels/plain", + test_postcopy_channels); migration_test_add("/migration/postcopy/recovery/plain", test_postcopy_recovery); + migration_test_add("/migration/postcopy/recovery/channels/plain", + test_postcopy_recovery_channels); migration_test_add("/migration/postcopy/preempt/plain", test_postcopy_preempt); migration_test_add("/migration/postcopy/preempt/recovery/plain", --=20 2.22.3