From nobody Wed Mar 12 17:56:05 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=1741215348; cv=none; d=zohomail.com; s=zohoarc; b=kxXRdZWgXID7TMmdmnJIqtcE/gafcK1chu/kKR2SW+li9O+R5zp+OkR2yuw3QMMRE1AB1uVz7IdQcHnW5EGxwi8rC34WttmFwJvGZOyiRcLrmVMV/pzRIhsTt2EM+E82C0ObQpbRI7EmIgtTt+qOVpfiK/D+PBwz7Dhqki41Pdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741215348; 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=WnwP0d4F8ak64CABMsh+iQnMmU+IupPy18ywFSD3kpc=; b=Ck87lKukAe3AWZedUorL6y60qURndgbabrDxjNNsnhZJ/7cajH/+px8MpTJkQDGKJIA4+mUxZK+9umvELJ/d65PG6l/br5+GaDo8AhPX53nokhnaOoRWUz87J8bKU/nEANGnG81aWPFGNBYAYzST0dkijTdXieyyUGNd45pc7Z4= 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 1741215348890206.02366728916672; Wed, 5 Mar 2025 14:55:48 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 3DA0016D6; Wed, 5 Mar 2025 17:55:48 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 824A4177A; Wed, 5 Mar 2025 17:50:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id B503A1524; Wed, 5 Mar 2025 17:50:41 -0500 (EST) Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) (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 824461502 for ; Wed, 5 Mar 2025 17:50:20 -0500 (EST) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-aaf900cc7fbso6842966b.3 for ; Wed, 05 Mar 2025 14:50:20 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73645459adcsm8074703b3a.141.2025.03.05.14.50.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 14:50:18 -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_H3, RCVD_IN_MSPIKE_WL,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=1741215019; x=1741819819; 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=sHaSnVJGahW2SBkZFBEmNpemRYDlJEZ6HWbziQkkMV0=; b=GrhwTOvmMWjakUlInW4OfSjO8lOpy8/JkbLfgAfZePn911obwrOQmZIhShpjWCmTvX bCrFVlKpcinO/DuG2NlCKLq7Bhg2yiQBRqtDRdUY2wpyMiqvyCoNsNHM4IH4hfQ14rqi PdE20mDQUwQStcR7eJeVsvNydvk8AxWp692GAnEMQVSBDD4hDPK2opnRwDdmQR6Gb6bY UTc72Jhkk7kOGMHhza440ikFqAWGgUJkx8BZ2+eBPsG8z27U1So3ZJmp8MzTc2UROftn g3CRFbZs3VtkhVirsjtZ1i3FfJHIbd1CH2a3aqDlDxH+Rqb0N3bs+PQudW2W6tv/yLxm xa6A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215019; x=1741819819; 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=sHaSnVJGahW2SBkZFBEmNpemRYDlJEZ6HWbziQkkMV0=; b=AEZSLDWLUPp5wUEkAGnO/rnWRj3FTWWrEK9RWREO44kv05fqQ78ns5od31kRcqzR9o OVI3prCy+aM3Ng91dR4It/dvNi9xvif8EMe611ut185V8eKmADFM+hHWIDmtS1eiV2x9 qDzP2ub2Rd3m/3AfQVY/agpAljLzqvCo4UdtrLu8PKR1miYDSfkZuD/3LpOxi61wG4Ky WT1oCHi2muFxz075ZW3lFrE39yYUYR+7nubl6XM+yp0IufJJn+pof031zj5JhujVgm9X LEMurwEkaK5SBL7u+q2Af6ORmsY8SKYcCezbk1ANinBl3TJZ89R+sweUbNbshTkk2Z3N OAfw== X-Gm-Message-State: AOJu0YzbcbwcKouznNZMv5BO3ZQqPRA1zwVU5Rjc5+03UHDDna7P1s21 dU5k0v5pheK4W4Gkj7mpA6TKebjyGsjJ2w+z4Jk2OKPxAtXgsXeE5OQXHxEznVSf5oCyKin5zUZ h X-Gm-Gg: ASbGncupnvXLhp4VNMVr8V4bI6n6GhEmPJgZPUV9uy7Bpt4c6kaZXOzz5JYXNPI4oZx 1tgteKxGa4NSifE8t0wZtiXyycVFINJNoDxGG8SMVMEVo5J9IjyMVTr4IN7vL8IG7FNK2LGbk99 vY37grDGNw35WjBzVOES6KDCeAbL1gdGCtgwmzgvCnlQOWzq+k1MKq/32JtmAmdFlu1p8zVag/6 lGAt1Plz0TWA1gXwIUNXYSHjo5ND1v4iE6FqIhF1Zn8RVpcWxBqVLDEYGGJP0og61ZNCdPCeIIK uiKo+yIfNZsxbrldmRIxrHC2RQb4608ypz4S+rZjyCUHvaHMHSMmsQf4LEAqaU8= X-Google-Smtp-Source: AGHT+IFVtFpybbtSUfxb888whmTCEPDW0Tp5ao5a8HXFh2/FMfnriS5Q3hbUIxl/cFDk7RrK1z3zwA== X-Received: by 2002:a17:906:4fcb:b0:abf:7a26:c486 with SMTP id a640c23a62f3a-ac20da862cdmr488142466b.40.1741215019385; Wed, 05 Mar 2025 14:50:19 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V4 11/18] qemu: Apply migration parameters in qemuMigrationDstRun Date: Wed, 5 Mar 2025 15:48:20 -0700 Message-ID: <20250305224957.5369-12-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250305224957.5369-1-jfehlig@suse.com> References: <20250305224957.5369-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CKYDRMLECVSRNL3C4BSJT55J3PDXZ53O X-Message-ID-Hash: CKYDRMLECVSRNL3C4BSJT55J3PDXZ53O 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: 1741215349817019000 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 f692986056..329b5f61d4 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2427,7 +2427,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; @@ -2435,6 +2438,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. */ @@ -3368,10 +3375,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; @@ -3403,7 +3406,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 9fa007b949..71a9974753 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -283,7 +283,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 cf99e4461d..23b2d4a7b6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8404,7 +8404,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