From nobody Tue Sep 9 23:57:21 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1737588549; cv=none; d=zohomail.com; s=zohoarc; b=CcWvkbagJYxJ+Wtjk72SSMJj2GuVAJsaqeT2ZPInfWzRtmqeuGi0b2n3b29A7Zw3n7oLXz0m17x/ZlyOOQGRkGHDPonBTWUR28+xq0ZgN0PS2GvksXcEitUWE3j8g9gmBC0j9t9aov9gLCLxM3hLVcC2atWtl9yGCPIaTurpb7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737588549; h=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:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=vtrLLB51zfZHK8QasOHNCaDX43Qci//2SJr3vluFdrE=; b=HXg/p+q9+QjC4/FZpq42LzTf40QCZFhhJQG9bSRoLqU/uI3rt2nSjbhV7A4SMT7ULdnXFkC0jeD5ijte8vQAnwkGk4R2iTeDk8+NFTgrWYH6nX6j3sb9HLJLhJ/qUaMVdZk6ZaQP82V3jgB1CqXuLpYXogMec/zg/rILserlKPk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1737588549971673.5121209302853; Wed, 22 Jan 2025 15:29:09 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 5CB0813CB; Wed, 22 Jan 2025 18:29:09 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F2BCB12A9; Wed, 22 Jan 2025 18:23:23 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id D0D8712A7; Wed, 22 Jan 2025 18:23:13 -0500 (EST) Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 6E0141376 for ; Wed, 22 Jan 2025 18:22:55 -0500 (EST) Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-5d3f57582a2so3067203a12.1 for ; Wed, 22 Jan 2025 15:22:55 -0800 (PST) Received: from localhost (75-169-8-111.slkc.qwest.net. [75.169.8.111]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72dab812f21sm11638253b3a.43.2025.01.22.15.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 15:22:53 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_RPBL_BLOCKED,RCVD_IN_VALIDITY_SAFE_BLOCKED, SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1737588174; x=1738192974; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZvgGqKBrpelOK1rsmgUvW/CJJHP/4HXwxrtFnQ0Rbsk=; b=MP8U6MUEwFUMc+4Y0wHe84UKcFDpFjnpogOWreXrnvirKT6OcYXQoauZeHoP7UHKOU e8KjjI0bXKr8l7ux0bVmz4kxQWuKp/fGym95QQjpDwMgpM1Sds6osvF4R+yAgM3QsO5I NN0t7LrXIw7LYhDuANvmz2lCIG6QuyVt5WGsx2AeJNTgV5pZxqK3qLgfgQJlU7WklppI dYNNa84MY2viF89sO6h0oVZVptJsqhlnxxxhln9L8ankYAaIZEZcxrgJExueTP0OgP7f WUnmUGby3Wk5e42rEs7Nyy5ohQcAucfqR/Fl1gUmpbjKRA888jLeinuUAw4RrE5jWt77 BSdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737588174; x=1738192974; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZvgGqKBrpelOK1rsmgUvW/CJJHP/4HXwxrtFnQ0Rbsk=; b=YZ42Q3TjZWo0ip56oU3KjPOW4US4RYihNYOju81dp46/Y4IfJOkV8MvYzeM3qoKjWY xyutJPHqaoRt2HguTVqjnP2NIIfalgK4R0sOY8cOHT+vDclgihlWKvpJuGdfAT2520mV dBtENxOfOasEcDBDmKX9ERi1u3VWoNKjrCX3ams1L6ZWZVqusdU8qxEODwOT/YEaWaWA 6rxJKGMDyzvIysmUjzpmUa00pvon84JhXlHA3cstuIp6LiOWYEjQ8Yj42Um59xjHkNxB miXMkolAoCTn7wZldo0g7TmsT5ng0AXyAqGXs8/+0wJGR11cNhJOfvuKGvZuGVmqztiq WOag== X-Gm-Message-State: AOJu0Yzh6lJVt4qg3pL7Bc1shSs0/iLp+LKk6tUUJfrwiVfKJG1PhnZL DASxHJA6njDD/RH/k5Iy0JWfECdNzTh0Rp54Mptq/wPg9/XVwJXff9T+EbTHUdcMyWGNrlyR72R y X-Gm-Gg: ASbGnctrfAWD82K+cE+0Q30U1ys2/H/2oMF/Lht38gZPyKZgbo3h26GHZIMP+YobfuG hn2bNPdhTDCSCwk6aaOwbICaQfVLqdWZDEidde1RQFALZUt1clk9vTBvMyR/MXTBjAip+4AjzhP VHanG4ROFc9LX9T4/Vjhkds6EOg7jqBK+p9dHDAjR2jZyiVk0F/SP7C1rX+0GTKT85FGWAtS34T xxXr2Myy51aOVWq4qbF5O/FN9Is2ooFk8NmEjqtpooJXmbU7ksctRg8G4Xuo/hlrz4Ak5XiWf/s qe0HfPju2jQR X-Google-Smtp-Source: AGHT+IG4nlIIB/PKHnZg/IvnCKG3gu6z+F+j5YMaKr5v3OmgG6ptGwqPDl0Rb+bA0eGJoGmsUlzCIQ== X-Received: by 2002:a17:907:8687:b0:a9a:e0b8:5bac with SMTP id a640c23a62f3a-ab662a8e9d0mr96091566b.23.1737588174215; Wed, 22 Jan 2025 15:22:54 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V2 13/20] qemu: Apply migration parameters in qemuMigrationDstRun Date: Wed, 22 Jan 2025 16:16:47 -0700 Message-ID: <20250122232228.19306-14-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250122232228.19306-1-jfehlig@suse.com> References: <20250122232228.19306-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SGY5ZRPNBHZ2QW3DR2TDWLTSUPYAL3OK X-Message-ID-Hash: SGY5ZRPNBHZ2QW3DR2TDWLTSUPYAL3OK X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: farosas@suse.de X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: From: Jim Fehlig via Devel Reply-To: Jim Fehlig X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1737588551774019000 Content-Type: text/plain; charset="utf-8" Similar to qemuMigrationSrcRun, apply migration parameters in qemuMigrationDstRun. This allows callers to create customized migration parameters, but delegates their application to the function performing the migration. Signed-off-by: Jim Fehlig --- src/qemu/qemu_migration.c | 16 ++++++++++------ src/qemu/qemu_migration.h | 5 ++++- src/qemu/qemu_process.c | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6a378128d1..b2f17f8006 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2376,7 +2376,10 @@ qemuMigrationDstGetURI(const char *migrateFrom, int qemuMigrationDstRun(virDomainObj *vm, const char *uri, - virDomainAsyncJob asyncJob) + virDomainAsyncJob asyncJob, + qemuMigrationParams *migParams, + unsigned int flags) + { virTristateBool exitOnError =3D VIR_TRISTATE_BOOL_ABSENT; qemuDomainObjPrivate *priv =3D vm->privateData; @@ -2384,6 +2387,10 @@ qemuMigrationDstRun(virDomainObj *vm, =20 VIR_DEBUG("Setting up incoming migration with URI %s", uri); =20 + if (migParams && qemuMigrationParamsApply(vm, asyncJob, + migParams, flags) < 0) + return -1; + /* Ask QEMU not to exit on failure during incoming migration (if suppo= rted) * so that we can properly check and report error during Finish phase. */ @@ -3317,10 +3324,6 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, goto error; } =20 - if (qemuMigrationParamsApply(vm, VIR_ASYNC_JOB_MIGRATION_IN, - migParams, flags) < 0) - goto error; - if (mig->nbd && flags & (VIR_MIGRATE_NON_SHARED_DISK | VIR_MIGRATE_NON_SHARED_INC)= ) { const char *nbdTLSAlias =3D NULL; @@ -3352,7 +3355,8 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, } =20 if (qemuMigrationDstRun(vm, incoming->uri, - VIR_ASYNC_JOB_MIGRATION_IN) < 0) + VIR_ASYNC_JOB_MIGRATION_IN, + migParams, flags) < 0) goto error; =20 if (qemuProcessFinishStartup(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN, diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 627d0cb3fb..b1f894e501 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -282,7 +282,10 @@ qemuMigrationDstGetURI(const char *migrateFrom, int qemuMigrationDstRun(virDomainObj *vm, const char *uri, - virDomainAsyncJob asyncJob); + virDomainAsyncJob asyncJob, + qemuMigrationParams *migParams, + unsigned int flags); + =20 void qemuMigrationSrcPostcopyFailed(virDomainObj *vm); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1f00c0016d..8d51da77c5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8352,7 +8352,7 @@ qemuProcessStart(virConnectPtr conn, relabel =3D true; =20 if (incoming) { - if (qemuMigrationDstRun(vm, incoming->uri, asyncJob) < 0) + if (qemuMigrationDstRun(vm, incoming->uri, asyncJob, NULL, 0) < 0) goto stop; } else { /* Refresh state of devices from QEMU. During migration this happe= ns --=20 2.43.0