From nobody Fri Dec 19 20:16:37 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=1738953783; cv=none; d=zohomail.com; s=zohoarc; b=RWhytbkS4qgoLWx25yjZt+kz1JcEl/u/HXIdqoT5UMBlaKlDv7L0TxPMHBVB2xbaZOHdg6EBlhacjVKJWpwMZaJATPp3hUcWJpqmQjSIo7gxiFoflVtYC5/K34PzgQxM/IC9iVCgAor8PemCRc8rld5c2E0HeAhoguFOeL7ycTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1738953783; 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=es9l4Jfgjb3aMUl1cdA6hqrBr6o00AWGK4yF5XhZWaw=; b=n/WBFq+0f1hQ67Kd5VcJGdwsxLTfjUbIR9k/lySBOJffDn9VTSv/REtDzhy+GUEDcKZbntFbm0qilW3hXLb3rYGm8LS2ctMiIEB08HzjmZAL8dicwoMkyd2PkP9bBPOlxJSOtO9NqATfOBIOZ+H/QU31y8pkiEWhoj7ORt+xr9o= 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 1738953783876460.06911140349143; Fri, 7 Feb 2025 10:43:03 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E307817D3; Fri, 7 Feb 2025 13:43:02 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 72AC7174A; Fri, 7 Feb 2025 13:38:24 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id BD0171541; Fri, 7 Feb 2025 13:38:14 -0500 (EST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 A2EB41541 for ; Fri, 7 Feb 2025 13:38:00 -0500 (EST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-38a25d4b9d4so1188066f8f.0 for ; Fri, 07 Feb 2025 10:38:00 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fa286ed9bcsm1733108a91.5.2025.02.07.10.37.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 10:37:59 -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=1738953479; x=1739558279; 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=lVuAPhAsHdBxViacy1XrFT2fATVX1alu4PEgRzxtpPY=; b=QxJmrCi30L5VUVyusjmLzmBhTB58ZqFwXMJVqvh1FQ+KuNrbc81gIHBx3hcZdG9jdu j6E1kdF+ghyFJMocvLXflG3H9y6eUIwjL9meJ3rWKQYjU/h7xqxQoKSKhm0qJu7kEsZU YvxYKVI9vZ+JL8+rani/CKunKio1zMJbbqPkMz6Lnq3xxCu00hSW9zm0Ap+Q6xbtLMiR YLWyW1q4MBQ4LW1jbKYxdGfivhMDijiTp2llSnQqGhthG4egTQ96WLJfKwIkaclmHx7d LMJDKwIraQAuM6xVOzfTZisIoZ5YOhdJJjc+1rYF79d9sBrD6hVgRj2aIpJ/HAsBguzW LzDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738953479; x=1739558279; 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=lVuAPhAsHdBxViacy1XrFT2fATVX1alu4PEgRzxtpPY=; b=lWSTXqrKgTpX1qI8K9nmWCR60RIQ9OsAi1CKYVCWx94cU8OH8oaObf2O7zzFZeTn3i WWTbOSF2WZxd6jJzwaaCjwUBPRrVDNR3rafwhHjzLknmKRWS1qTnr0u8dxCbqUZnH6o0 Ux8Nv1C/TCg+eioAoPqbzNjcDLzx++EIZtsycycRHc1CQaGQ90hi2kS+WtCN2GCtoRxF Hrd92XwayrTACDV9uxnQ7h/rqPFlXA7zjxFd47U4eFeN2q46DGQuLzVKwvNOA/R2iCi0 kJ87TnOstmbrWxIwYGASDvHyHKyYeDuy+NXhpFM6GBnXD1nUodxVKfec2/LtXILAFJZz UIFA== X-Gm-Message-State: AOJu0Yw+lp8add1PurudJH/UHUYCT0PisogqsQk81xX3/A1jJT6Driis ogpyAGo4l/+dxeqRWwfWPlrm1ZexOTIrvZkUCC+XmLeyXMfNr3tdmcmzQk5olVnUE2n+suf9+4N g X-Gm-Gg: ASbGnctk+2MRHK8MwbQX4Dlaep3s6GiZWHJmT0NJ/wOfKyhurB0HHw2ZT6A13O81I70 hTCFrgzOwDEBH5GvklLcg9arun/GJemGFeZicytrg5K38R7X9vnZM5n+VVJuYM9Jqp19A7HgVp+ LJIMBror7uIk4GkKeuUn2xHu/6pwyYnoMU5P3nlDLcjPoi0nAMk9tys8wt/YtXfdnaUwvQoyuh2 KmjPeYBJ6jpRQPFZl1O3OS76cdUPG+c+U4wEKhbNMHW3rBI7ix2i5BC654Czg6JFFvTAezW/W7e iRvk5cxlLZhB/uek4Coy1o7KWSnpti8lqQ== X-Google-Smtp-Source: AGHT+IEpmOOqjRDuvI1Z1pJIy3MTY6yoRl+ikQr3iLdwci8gGdHr4N03abiUshb3h10AJykwBG5ZzQ== X-Received: by 2002:a05:6000:1845:b0:38d:b807:b894 with SMTP id ffacd0b85a97d-38dc8dc35c3mr3250161f8f.18.1738953479515; Fri, 07 Feb 2025 10:37:59 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V3 12/19] qemu: Apply migration parameters in qemuMigrationDstRun Date: Fri, 7 Feb 2025 11:27:23 -0700 Message-ID: <20250207183730.21686-13-jfehlig@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250207183730.21686-1-jfehlig@suse.com> References: <20250207183730.21686-1-jfehlig@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: L6F3S6XFVJLQWRIE26POXIRTN7KDXV3X X-Message-ID-Hash: L6F3S6XFVJLQWRIE26POXIRTN7KDXV3X 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: 1738953785601019100 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 1e3bee3781..bd46143717 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2380,7 +2380,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; @@ -2388,6 +2391,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. */ @@ -3321,10 +3328,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; @@ -3356,7 +3359,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 524b23fea8..063033cb95 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8372,7 +8372,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