From nobody Sat May 18 08:35:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1689197297; cv=none; d=zohomail.com; s=zohoarc; b=QTGKegK57nujRPmRgZ+k7ftm4jUHOwT5a6C2w+844mFtJ5SvtY/q/KPg9VmCVydUMOXo3ERKsEWlFyyRPdCMe2hk92dnQtTZWO1vIfGnQgaC4Kp2+Ti2sBrufhJxah/GhCNRbvzQoVJqEVOhlKFSUSqPQvhksvrRGaDaOnjBCs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689197297; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p2QNDg6EgJHs6wcu7ZRS0kFaPGIJrbcY7ObWnlqbmaQ=; b=ZKwa7o9sNwsY1snM3cpCflLB3zXIeLrX53elJkk5mYBpykhFnuWmhqUjsf06fIs6qW0veNobdKuD2/nL/EyQlqFz/ZiQEItRR6wNMoqd3YbhX+xH8xgd+VXMzjUCsqkwWfgst+sueoenwhlwEejqVxxYgZ/XyALubI80oag/BYw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1689197297085167.9844246501849; Wed, 12 Jul 2023 14:28:17 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-37-8YAJrzpOOk6iQsKOx9AgiA-1; Wed, 12 Jul 2023 17:28:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84C2C3C100A7; Wed, 12 Jul 2023 21:28:08 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6CF11F66BE; Wed, 12 Jul 2023 21:28:08 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 2F14419465B6; Wed, 12 Jul 2023 21:28:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 824011946589 for ; Wed, 12 Jul 2023 21:28:07 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 72C60111F3DB; Wed, 12 Jul 2023 21:28:07 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6AC0E111F3CB for ; Wed, 12 Jul 2023 21:28:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4DCBE1044590 for ; Wed, 12 Jul 2023 21:28:07 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2050.outbound.protection.outlook.com [40.107.21.50]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-104-SS5b9zcUOsWxW8NY-vrOWw-1; Wed, 12 Jul 2023 17:28:05 -0400 Received: from DB7PR04MB5980.eurprd04.prod.outlook.com (2603:10a6:10:88::11) by AS8PR04MB8231.eurprd04.prod.outlook.com (2603:10a6:20b:3ff::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.20; Wed, 12 Jul 2023 21:28:01 +0000 Received: from DB7PR04MB5980.eurprd04.prod.outlook.com ([fe80::9841:f441:de35:f795]) by DB7PR04MB5980.eurprd04.prod.outlook.com ([fe80::9841:f441:de35:f795%6]) with mapi id 15.20.6565.028; Wed, 12 Jul 2023 21:28:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689197296; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=p2QNDg6EgJHs6wcu7ZRS0kFaPGIJrbcY7ObWnlqbmaQ=; b=KZbG5M3X/WI6vSqxj7RZG8vPTxD369cbsvnOMMjw7NJHoBvXj2RluRv7Y8SyNZLZfFDGjU A/8EWmQnBtVEAhlf81xAs540tcKGotxsIG84EjuK69msztKxtH78oqZT5yhnEzrfS3ndp5 6G1EcbjGsMxAZAR+29/S09hBCEZ8cUA= X-MC-Unique: 8YAJrzpOOk6iQsKOx9AgiA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: SS5b9zcUOsWxW8NY-vrOWw-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 1/2] libxl: Don't attempt to resume domain on canceled migration Date: Wed, 12 Jul 2023 15:26:14 -0600 Message-ID: <20230712212746.687-2-jfehlig@suse.com> In-Reply-To: <20230712212746.687-1-jfehlig@suse.com> References: <20230712212746.687-1-jfehlig@suse.com> X-ClientProxiedBy: MW4PR03CA0080.namprd03.prod.outlook.com (2603:10b6:303:b6::25) To DB7PR04MB5980.eurprd04.prod.outlook.com (2603:10a6:10:88::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR04MB5980:EE_|AS8PR04MB8231:EE_ X-MS-Office365-Filtering-Correlation-Id: 07f6d1fc-9ed0-4620-6e52-08db831ede86 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: PrgF3rqNjAdX7AubQ0JlrAlZKnhvOtOFuhoQ5nsSrAFJySIkd5sQCAzwQ1G6q13TxceJX5YzsqGaqLLjjxDzGwfC8FXqFIK5u6yDYQK5g8Al1ZT9iZ53Md94L1IF79kRb2YReeYQiyYZ25oIvT4V+zGrCON5VlWDdP5wWiLFwx6jYY/AANAGr6QrBvmnuOrNOdW4zDNhwP0UWj4VmdbZmYtGR9mHNprdO0qKmofvOVysW2tRIRQ7tKfZz7PLMeDpgax1m9klLNY/Rw/ijqbjiifOBp+xxMuof2Bq0c+cjfumwJYLuue47ERoyXcIAt5LVXyWUtyenHR/g7AEThuTLof+WCMPEgfC3zBWFf2qGK4dqT5PNKcnAlAOyGcTHMce9xEj12diz5utft11oEpE/8fQ9vvHikVvGZepbiFHrzd7Y+RngHRHWTTxd9tZoB+W8ilt7Rf+75TLzyMC1iklYuRhV9iH7kLT/im/94uqbtmdmJ/hYNGb3pycLH4O/AwaVKquMmchFvamQRaWwtdwYLjeMboWv4arDGrt9GOeLAWjjLH12VPYH9+NdxCsy71a X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR04MB5980.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(396003)(366004)(376002)(346002)(39860400002)(136003)(451199021)(478600001)(6486002)(26005)(6506007)(1076003)(6512007)(186003)(86362001)(6666004)(83380400001)(6916009)(38100700002)(2616005)(66476007)(66556008)(66946007)(5660300002)(316002)(8676002)(8936002)(2906002)(41300700001)(36756003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/2P+E0UpUr+gK2u5gFt6p1He73XeHuR/hB6yiq8OTyYgh807lp7it0r6sv5D?= =?us-ascii?Q?AJHwfeLfQto0pdY1tKiOY8ia4Vhv+ldU8RxEDJm8IpEjU1/iiYK0E7CGO+3Y?= =?us-ascii?Q?DB5Ds4zgy7WQyC43h6vNJKMxfZtTtKF2KduT5GSrEGjsexXpYYyzkwmTaVRW?= =?us-ascii?Q?w3CwfbcnZCja7TshbqPFSD8ajVXukabxE162dWe8eU8VetnCotwWgrz4YPHw?= =?us-ascii?Q?DdzowruOcazJSx3LQBhKcgsq8EKtczsWAEOsdRmcXUWwHEuDQDopSKfiAgZ4?= =?us-ascii?Q?ktqdp0kq17VvkjS7lOXh6CJtYPFDkqM9bVxNNS+DSkcrmTEbkF6cX2nupqni?= =?us-ascii?Q?Go8ljjYYp/y4Ce0aIsjb2FXulB7VASoj0ZyrcpwKMMihiW0ZUFuX+wF+2cvY?= =?us-ascii?Q?vxLc84DDbgBfMrh25RTL6eGYHLsrW0EwOGvMSz/Vx6UuXsMSRTlG3ELtxOVC?= =?us-ascii?Q?IqZ8492CRqe66GL4lmVicceg2Bl9tvhy9PE7BqYs2OWsys508MuiBTO80IIE?= =?us-ascii?Q?AcZP+rc0nJ9gpuEL5QoF+JBzBVdcUnFaZyd2usZsPEnIjF1nWzCIgkRKg7aL?= =?us-ascii?Q?odF4xQxAmssZTLkkCebMcaIovKAv5uK0neg7f2M0t7TbQT3BSPVEEDYyvzOD?= =?us-ascii?Q?s1FtHZucNjtQltBbASvAqj7qvei5sD+jUN+U9ZNNXucwox2hc1VcL/PZ607Q?= =?us-ascii?Q?EDLus2VEPmO8R6P8ZfGM2qJUE/9Bqcj/vlrWNfxQv3T0az3VOipfyfurCtf5?= =?us-ascii?Q?nz3cNMaMZhUFQ9Qj3x711f9MmYcmNMnbryPQn1geOSRjhAfPBTBVtlfsqh/N?= =?us-ascii?Q?TdF8KTEWyUQ11N3fmn2XYDigRN4m2/ZlWLFpyP4HCCz4NxmBNoKjFaBbP/C+?= =?us-ascii?Q?0BttwvpF57F88+gy7cAxftuGYp/z4+q/wtbLiw3mFzF/W/k4jchCsxMqPZfQ?= =?us-ascii?Q?r2+G3v+CnLSIpB5ZXBe5b5a0B4qw1e3QT3iZC7clRBTjfp+8wd0XatgMNyZk?= =?us-ascii?Q?1wHseUvG+GihHNOEc5IN7opu0lXSgnxF91ABj5mmJe2wtwl5SeTqkMcGayXT?= =?us-ascii?Q?TiFUqPe0Gvtu8v0v3G3hx1t8ful/f9IqGpP/h4r/mcDdoNFH3Xsj08Eedtgw?= =?us-ascii?Q?BT02VTqMh8O15Z4Hi/hbvJPpSaHsiLEN3fPHr62GbrtG34yYMVV0EtXVaExh?= =?us-ascii?Q?cVTNCBE/M+NtyIeeIW09pdmE2Y4ExPv1WWvu/ljbBS3hAfwSwMjtB0xNC4lk?= =?us-ascii?Q?jQGyPVtv15EkQ/I5ihF/FcQY9UVZks7jkbAvKm1AvpxwpZ6KPXBO8eQFVLE7?= =?us-ascii?Q?O9Xyh+AezM8gvbJuAWC3sXor5E1YmcnJJPuKtWeapVFcsVCrz0DqFS13MuVW?= =?us-ascii?Q?uOXXo77LiZpUwbLA9GsUg2CRdPOJYnVuNk7B0f2I9/rz2q2mKZ9E2O1rxoSJ?= =?us-ascii?Q?D/4r/wpC+TWpeSHZghryv/y3uFBYRmMn0iKF7ZT70CRkJYWTDKnsDn+w/y/2?= =?us-ascii?Q?kDdHJBD5I62JaNF2PiqDqBzMyvCiIomJf3t0pNvqwkIVz1jeUbsTYcZleCVR?= =?us-ascii?Q?sh2SGkuIH11R5Qxw+BJtkcAKszCfqNB+phKYKPNs?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07f6d1fc-9ed0-4620-6e52-08db831ede86 X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB5980.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2023 21:28:00.9722 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /lgJJ1Df73kWfUfrUfwp9lWQCA4pqVjzQMscP/dPvTp80Q2efDqSYlcyYGNtA4T0JLHY1+WXGQUPJ0uaE/P7Rg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8231 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: suse.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689197298765100001 Content-Type: text/plain; charset="utf-8" For unknown reasons, the libxl driver attempts to resume a domain in the confirm phase when a migration operation has been canceled. This has shown to be problematic when simulating scenarios that result in a canceled migration. In all scenarios, the domain was in a running state when entering libxlDomainMigrationSrcConfirm, causing the call to libxl_domain_resume to fail. Making matters worse, the domain state is changed to paused when in fact it's running. And finally, libxlDomainMigrationSrcConfirm incorrectly returns an error. Remove this incorrect logic from libxlDomainMigrationSrcConfirm. On a canceled migration it's sufficient to resume the lock process that was paused in the perform phase. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libxl/libxl_migration.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index 961815f9f7..a91091f5e8 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -1342,7 +1342,6 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivate *dr= iver, libxlDriverConfig *cfg =3D libxlDriverConfigGet(driver); libxlDomainObjPrivate *priv =3D vm->privateData; virObjectEvent *event =3D NULL; - int ret =3D -1; =20 if (cancelled) { /* Resume lock process that was paused in MigrationSrcPerform */ @@ -1351,17 +1350,6 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivate *d= river, vm, priv->lockState); priv->lockProcessRunning =3D true; - if (libxl_domain_resume(cfg->ctx, vm->def->id, 1, 0) =3D=3D 0) { - ret =3D 0; - } else { - VIR_DEBUG("Unable to resume domain '%s' after failed migration= ", - vm->def->name); - virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, - VIR_DOMAIN_PAUSED_MIGRATION); - event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVE= NT_SUSPENDED, - VIR_DOMAIN_EVENT_SUSPENDED_MIGRATED); - ignore_value(virDomainObjSave(vm, driver->xmlopt, cfg->stateDi= r)); - } goto cleanup; } =20 @@ -1380,12 +1368,10 @@ libxlDomainMigrationSrcConfirm(libxlDriverPrivate *= driver, if (!vm->persistent || (flags & VIR_MIGRATE_UNDEFINE_SOURCE)) virDomainObjListRemove(driver->domains, vm); =20 - ret =3D 0; - cleanup: /* EndJob for corresponding BeginJob in begin phase */ virDomainObjEndJob(vm); virObjectEventStateQueue(driver->domainEventState, event); virObjectUnref(cfg); - return ret; + return 0; } --=20 2.41.0 From nobody Sat May 18 08:35:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1689197312; cv=none; d=zohomail.com; s=zohoarc; b=iUwBPBL0J1xEbEsjVCghDC5PDA1uNe75Lzq+CtvTkZ/IEBO0qSxbwpplcWIXEVzQOzNilLjVdJcw9JXqfM1vjIBTzB53CNf2Uf2qFxCbiUjXaf0n1a329z2LYLa8MbF3dJRADQC4F19utju7GqprZM2YTBmevNYp4IgC2pM7X/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689197312; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+snlhldcjL4D+yQUGlaURkmFcWPa9f6NCBjuGmRRtQc=; b=SuMs7s98tLHkSSjC4GxgTwLYo8PfSPz3ZvB9jpynIF0K2YmZQsMdrkbwSKR2+lvnnw24VY75+LF7E7HASItyAbTJK8Sve0wNO+aB5Uzh/cdlnG/W1+arw9O9kfZJUWS6YxyuQQ7w3pRWG0+cwQo5OiH3Ohd0u6pwrNMYIG8kiHs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1689197312076364.4799936885606; Wed, 12 Jul 2023 14:28:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-357-Kxt0YbOFNk-0b4YU5d_mqg-1; Wed, 12 Jul 2023 17:28:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A9D682800169; Wed, 12 Jul 2023 21:28:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 940A4200A7CA; Wed, 12 Jul 2023 21:28:19 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 32E31194658F; Wed, 12 Jul 2023 21:28:19 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9F89819465BC for ; Wed, 12 Jul 2023 21:28:18 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 6E7EF4CD0CE; Wed, 12 Jul 2023 21:28:18 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 65AA9492C13 for ; Wed, 12 Jul 2023 21:28:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 474878F77C5 for ; Wed, 12 Jul 2023 21:28:18 +0000 (UTC) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2076.outbound.protection.outlook.com [40.107.21.76]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-266-dJDm6GtQOFWxhgIBsNpW7g-1; Wed, 12 Jul 2023 17:28:09 -0400 Received: from DB7PR04MB5980.eurprd04.prod.outlook.com (2603:10a6:10:88::11) by AS8PR04MB8231.eurprd04.prod.outlook.com (2603:10a6:20b:3ff::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6588.20; Wed, 12 Jul 2023 21:28:07 +0000 Received: from DB7PR04MB5980.eurprd04.prod.outlook.com ([fe80::9841:f441:de35:f795]) by DB7PR04MB5980.eurprd04.prod.outlook.com ([fe80::9841:f441:de35:f795%6]) with mapi id 15.20.6565.028; Wed, 12 Jul 2023 21:28:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689197311; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=+snlhldcjL4D+yQUGlaURkmFcWPa9f6NCBjuGmRRtQc=; b=XlLYn/I6oLPg3pYUeQNtyUKhEH7uQ93tQ6S+Z8k5sK2iZH1IPR/GnS3JseVTXika2IBpHD +uK6MEDbbfNPPbumFe+kCcpfO+/L/JMbDhik7rgITndnbd61flTxCHyWiUx6N0solnGIGf lBN/WHooRBgR53D/jtsfKkC1Vy85k/E= X-MC-Unique: Kxt0YbOFNk-0b4YU5d_mqg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: dJDm6GtQOFWxhgIBsNpW7g-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH 2/2] libxl: Advertise support for VIR_MIGRATE_CHANGE_PROTECTION Date: Wed, 12 Jul 2023 15:26:15 -0600 Message-ID: <20230712212746.687-3-jfehlig@suse.com> In-Reply-To: <20230712212746.687-1-jfehlig@suse.com> References: <20230712212746.687-1-jfehlig@suse.com> X-ClientProxiedBy: MW4PR03CA0064.namprd03.prod.outlook.com (2603:10b6:303:b6::9) To DB7PR04MB5980.eurprd04.prod.outlook.com (2603:10a6:10:88::11) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB7PR04MB5980:EE_|AS8PR04MB8231:EE_ X-MS-Office365-Filtering-Correlation-Id: d4541629-6004-4591-f7cf-08db831ee22c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: Bk2caFmlaT1TiIbIxeY9xOT5N3Tt4AxIqIkFVC6Eq4j1IDmM7mzLLqSaChwQJabuFgWle8fhSQKcYkOCpZcLtuAvym784ktYa7RRBGe9866PpyokZ9Ziv2mbXfOCV6/h+/XNMWxVeRwEFnYrTeCsx3DVS1ONEivauV6/ojLQLPBNGuBRJ+q8pF0h7e8u1PyG38dMhL7sBF3JM/8P3GMK36KtspL3fu01xpiDPWhy9rT8RU4sWUBCotGmfgdtwhWuhHGJMwUCkhTFP0o1lqz0VAZRE41tx0bBPxu4mCoVMgcaF+cr+TTJwMwHAzS/H2amcNUkPjTBj21m+4XYdxpCzgTjMRILQNh6b19lMDjXBxjBdmjFRor7yzK/yq++9Zam69SV5dEHc8j2tN+uhTGsOwzItYmsXCMW8HcCGkW0y+WaHm9YVMapyRQe8sjA7etOLR8/26NVGuA/nLdjxQ6DnpM8l0YdzoiHhCE2z2JumFj43H93JEb4TTbNZFh1h3AzAg6I8YISz8eqqw5wBmNpLASuEVBgdmZ9szV88TNQ512fPtvPn5QwOvEjqfoyYaHJ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB7PR04MB5980.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(396003)(366004)(376002)(346002)(39860400002)(136003)(451199021)(478600001)(6486002)(26005)(6506007)(1076003)(6512007)(186003)(86362001)(6666004)(83380400001)(6916009)(38100700002)(2616005)(66476007)(66556008)(66946007)(5660300002)(316002)(8676002)(8936002)(2906002)(41300700001)(36756003); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lhlHVGpLtNxAtplyZ60D8jMRnpvHTPT4qd8QQ+RnZ26Hrjfx8L3YhgpWQjDK?= =?us-ascii?Q?vc8vP4De0qpg2JNQ0JMN1EWa/VRaNVrZ8qXT1sUS+SyAjumR7xPrU29M8Gtu?= =?us-ascii?Q?LvvjB3pxigBoNKPwvK0TmJQ2dTaS9NBhUOFGxzl0N9x+zTjlLc2VrW6w3zeB?= =?us-ascii?Q?wZSLGB+eF5D2jSwt8YRSFeL25Ocyrbf1SYKQaP1DJP2outnYz+dy/H97NiSJ?= =?us-ascii?Q?KN+IDZbAce9FtZWI504j4ezRztp/jwmZ9B554wgXhTKywdF55PsZeb0piGg6?= =?us-ascii?Q?h4ZSKDhpMg3W2CcsdeTuBxNWvciBn8n63ytk3B0vbpqlgh1NGLCRaEHEDq8n?= =?us-ascii?Q?DgeytgbdUNqckY+9SlKrV4PxXDBBeCC4NpCYUcO0uuIEDFSFgWXPqTSMU7Q7?= =?us-ascii?Q?TykfDE2RxZhqxcE6ttjIB8TppSiRVxvpZUjrPNb0yWlBjDeC9bGgXLB8IY5a?= =?us-ascii?Q?ex4KSpZkNVYlLbcVQ5f9fsE/pJFNjNthN8RnOLLSVpVaHrPiuQ8aRiVwlQAk?= =?us-ascii?Q?WpnVStUFVo3+qOfQyRFC1RWiOSQ6trhwpOned2VQDdXP4zkt/t5Rr5xYseB5?= =?us-ascii?Q?ZPPfRLf863nzSKUU2qiBnt9PGBCmtymFHhBpfHLTyaBI5qL5UwZKl/t7yxua?= =?us-ascii?Q?rK9zKhc+0kAwRJkV5TtKO4nEUy807dS5+GRlT6qQsN/yAYCaf5x2IYKHw7Lk?= =?us-ascii?Q?Oi8e8FmX9aIZoG8gvT8r4cVtrarQSSFwsZr/HYTm20UEjC4CjTjYV9+Lu/IB?= =?us-ascii?Q?SZ3KdY4LjCEMojpKHlj0R1k9qfaHXFLHQR6xd9kKBWzR5Zau0RgcXhohUIbX?= =?us-ascii?Q?w5ymJisUtgYd8JBhSNamQS/R6QWiW4nVacf5hcS/bFbFkt+4b8b3WrstPhMS?= =?us-ascii?Q?9OWg/s3b4BUjd1Tyt18JYykvXWO8JsS8XBp5em9jS6iC9nAtLmqOWoAOC0HM?= =?us-ascii?Q?h7Geh7V1IhJPI+Q6lqZ44Q0apyxIP1QyJoUCKzPwss4ovp5Fe7ArQIuLCF4l?= =?us-ascii?Q?yEwHT5qyRNjw7DP8Fg2TNWyT8GmE56lkQxvSVlMgJVtvWzYSbLKpc7XRGUML?= =?us-ascii?Q?X46lBlCW+QU2w3UL572YfrnS+3jZ/5BAPHIx8Enr9uEI6zgYuKclvGAzMndb?= =?us-ascii?Q?7iDszaD3f+P6wLkga/hQN/G+1CcDFcaz3g1J6MiSx+4U88v87ziD77EXKQzj?= =?us-ascii?Q?xWWRGO3nZjRc+rssFyr4vfKj9Bnebi8+iHz766tLskwuyKMSrWgDsiAMX0b1?= =?us-ascii?Q?Eu5We+UZmu+sy9DZsFL0IlWAafiSH4IAyNef1fSoqRDwg1RG2GQ1PmXALEqD?= =?us-ascii?Q?Ke42lMs9iylaCX2i65j51oXadTNOWLFy1SXOegyXc6fMrh8EYLPDh8/4HpIK?= =?us-ascii?Q?azgAI8vhjcRTGUDPhE5KbnRwxx7q4xvMiLSANTPXbnGAotsLUlyyVghRh058?= =?us-ascii?Q?a4tEfc+iecRHxVhw8Yt3Y6p9zZD8Hcyvvu7gNtX6tb0QMXZl4+TT3m8ians4?= =?us-ascii?Q?nFLeibjjrb3Md8gYOaFzuuR+oCxYZZ7RlOqPTO+yLilI5VHRI8UAhR7qxU+0?= =?us-ascii?Q?yEvNUybF065j5P7GddYZvBwPOXMne9Li59wdVP5w?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d4541629-6004-4591-f7cf-08db831ee22c X-MS-Exchange-CrossTenant-AuthSource: DB7PR04MB5980.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2023 21:28:07.1941 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dCEKme9giGVN/VyaaLJ89iBYwdqgm7CtF641kWYVkyEPrfrfcwFxTdYzpaIc6daC46X78hNLmJ1g6odoKIP4IA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8231 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: suse.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1689197312907100001 Content-Type: text/plain; charset="utf-8" The libxl driver has basic support for VIR_MIGRATE_CHANGE_PROTECTION by starting and stopping modify jobs in the begin/confirm and prepare/finish phases of migration, but it doesn't advertise that support. This can result in unterminated jobs because the migration logic skips phases of migration when the VIR_MIGRATE_CHANGE_PROTECTION feature is absent. Ensure jobs are terminated properly by advertising support for VIR_MIGRATE_CHANGE_PROTECTIO= N. Signed-off-by: Jim Fehlig Reviewed-by: Daniel P. Berrang=C3=A9 --- src/libxl/libxl_driver.c | 2 +- src/libxl/libxl_migration.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index d99bc37bf6..2644d1400a 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -5846,8 +5846,8 @@ libxlConnectSupportsFeature(virConnectPtr conn, int f= eature) case VIR_DRV_FEATURE_MIGRATION_V3: case VIR_DRV_FEATURE_MIGRATION_PARAMS: case VIR_DRV_FEATURE_MIGRATION_P2P: - return 1; case VIR_DRV_FEATURE_MIGRATE_CHANGE_PROTECTION: + return 1; case VIR_DRV_FEATURE_MIGRATION_DIRECT: case VIR_DRV_FEATURE_MIGRATION_OFFLINE: case VIR_DRV_FEATURE_MIGRATION_V1: diff --git a/src/libxl/libxl_migration.h b/src/libxl/libxl_migration.h index 078510c672..19b68d08b7 100644 --- a/src/libxl/libxl_migration.h +++ b/src/libxl/libxl_migration.h @@ -28,7 +28,8 @@ VIR_MIGRATE_TUNNELLED | \ VIR_MIGRATE_PERSIST_DEST | \ VIR_MIGRATE_UNDEFINE_SOURCE | \ - VIR_MIGRATE_PAUSED) + VIR_MIGRATE_PAUSED | \ + VIR_MIGRATE_CHANGE_PROTECTION) =20 /* All supported migration parameters and their types. */ #define LIBXL_MIGRATION_PARAMETERS \ --=20 2.41.0