From nobody Wed Mar 12 17:14:53 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=1741215265; cv=none; d=zohomail.com; s=zohoarc; b=Y5OhR4xHlVEH/y/g9UmpNQGjltFgKxkJ5YLx3qhiwYLQfnxLuSC3Vi37QmGfG9QTKdaPcU3iLwILslHlFr1WuBt2Zqd4n0qoIY+pnMzRz2f6SE+nooUZHgjU+Qns+1Wwck1PhBHQfBuv2o88TvoqN28lLJJ4cc361kIKLaCxfRA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1741215265; 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=uvP7++f2OhizJE3+o0F6GkDMwxrtHBRks+e1Sroj3no=; b=J1c4PC1O0Sf6lSY16A2dHf7HHNz12lgDesk0jrczauLJUmIDgBx8PzoTnIDmI4R+CgKNAtUG8sT3/xB3xQXYfCDlYyHfKYor+4zdmpuk1ojh8jbu/w9c2CrFtsGE0gDnoCP1SvJQT+qLH96HuoOKGEuNTZDxFbfAHHvciJlDKzE= 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 1741215265033582.7972743606354; Wed, 5 Mar 2025 14:54:25 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id E1AE817AB; Wed, 5 Mar 2025 17:54:23 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 30F04150B; Wed, 5 Mar 2025 17:50:46 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 70A501663; Wed, 5 Mar 2025 17:50:39 -0500 (EST) Received: from mail-ed1-f52.google.com (mail-ed1-f52.google.com [209.85.208.52]) (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 E481915EE for ; Wed, 5 Mar 2025 17:50:18 -0500 (EST) Received: by mail-ed1-f52.google.com with SMTP id 4fb4d7f45d1cf-5dca468c5e4so1660083a12.1 for ; Wed, 05 Mar 2025 14:50:18 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id d2e1a72fcca58-73667e0c9e5sm5368517b3a.14.2025.03.05.14.50.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 14:50:17 -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=1741215018; x=1741819818; 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=YG0g6lqgq9wciHPpT9sKF8kcKwbDko6uwyFN5XmDZCQ=; b=CDgkqt9edICs+/bdjX56rXp8tDALguEVQn/lNqDvStSxwReEaMEAlNwJrg6VOmTO6H cNre1xwXPKu4vCOh6ehjok5x2hvhMXsQPuyMRnA/B82zy/Re0zC+R7MsJ9nWxHexNgUW +BWXFcJMRHnrJmMJBMM+9cpsWRkI9/kc9pG/Yj/mVNnavuspYu29DlGAHG/T+h1HtalY CsNVGPLXm1R1BskF4oTyBzklZULt8t30KitAxEalNlFvHnf2aa0Nn1wnRdPoeU2/q5I3 epNdhnBGKy2abXMuVbSjy/ebZa5tYwGMcFdQlLslhM+ilxXpR9oQhb3EgQlWRBlIjKBK 68Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741215018; x=1741819818; 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=YG0g6lqgq9wciHPpT9sKF8kcKwbDko6uwyFN5XmDZCQ=; b=csf7cpt5mRir0qZ+tandFCvb8WNGvpY7lcwkOdEUrwjqGPmMtErpfwBqnFBviJXjl0 /f0lN8ZQpZ7ptVHqYxlwAQvoUuDUewHYfuWzFfB57lIqRDjmQxFqITHTraaPLN0TD3V9 SU3zWbWwvVclj2KW8GCvn0rKMY6VUfJzyyCnSIQorNkGqT71y7LfLV6KsgtGWzu5PGae IROR3H85fVwXvdi4pzuLh3WbIFxAcIrI7LWWmL9GlaoMvL3pq/RSlutO3M7j4vr2iKR+ oRP15VvHsxcYRJdWyKX2Zv3FfXg4ziyUJE/q8lxtZ6KyxZV8XqKAEEPaphgkGbJaSgMa ecMw== X-Gm-Message-State: AOJu0YzUoDYnrd5zH8ywnUsImdmnTsZdgbKp4B3VqZhhY4wdrqTq7pxU YDdz7XpsUdpsYNm1kjpTcKNK31ijjTpp1Rvsc2urjeSrRQBRLyUtI2cx1hjcY/7W4bGDUnLDFUN K X-Gm-Gg: ASbGncsUGO+3CUl+yNkKylacUhYamTL2bYp9dL3RYdS02/LvAzr6phYmoD+x9lBC+Jv VLj4bp35AB4LwNVayItT8Y+TzPC5VeqbSzFHSNT9BBzYC50PuBcs/4TdPDDT7/ruGcAO03461LU kT8ool5PJVBGUimOjHC73gyCK3dEELJo537FgNV7OkP7P2sQo6TOvl7ZHbWhkUuL3rfbSEDOa/Q f0vPvaecwLmPPUNU8j2//u+0WVZz9jm9tjXDBJIRv6Wc5jdAvfewT1z5CQuuOZ6DzR2Rl8Eqo2D RNVQ2wAJEYOibscJ8n+RdjtUiMM5CpjKEBZuO91cbKMYA8kc03uEsQSfkpaglEc= X-Google-Smtp-Source: AGHT+IHNp/7+U/8nkFR25NstDz/ERTItpy69hcyWTXUiIhul5U1z/2PVFQiw0Ze0oc0f+XU7zwCJ2w== X-Received: by 2002:a05:6402:4305:b0:5dc:63d:b0c1 with SMTP id 4fb4d7f45d1cf-5e59f486e1fmr5127954a12.29.1741215017665; Wed, 05 Mar 2025 14:50:17 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V4 10/18] qemu: Move creation of qemuProcessIncomingDef struct Date: Wed, 5 Mar 2025 15:48:19 -0700 Message-ID: <20250305224957.5369-11-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: J22MET7M6BAHCIZNUIF6NZU2COINNVYI X-Message-ID-Hash: J22MET7M6BAHCIZNUIF6NZU2COINNVYI 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: 1741215267128019100 Content-Type: text/plain; charset="utf-8" qemuProcessStartWithMemoryState() is the only caller of qemuProcessStart() that uses the qemuProcessIncomingDef struct. Move creation of the struct to qemuProcessStartWithMemoryState(). Signed-off-by: Jim Fehlig --- src/qemu/qemu_process.c | 42 ++++++++++++++++++++--------------------- src/qemu/qemu_process.h | 2 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7b7b5c17e3..cf99e4461d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8347,7 +8347,7 @@ qemuProcessStart(virConnectPtr conn, virDomainObj *vm, virCPUDef *updatedCPU, virDomainAsyncJob asyncJob, - const char *migrateFrom, + qemuProcessIncomingDef *incoming, int migrateFd, const char *migratePath, virDomainMomentObj *snapshot, @@ -8355,7 +8355,6 @@ qemuProcessStart(virConnectPtr conn, unsigned int flags) { qemuDomainObjPrivate *priv =3D vm->privateData; - qemuProcessIncomingDef *incoming =3D NULL; unsigned int stopFlags; bool relabel =3D false; bool relabelSavedState =3D false; @@ -8363,11 +8362,11 @@ qemuProcessStart(virConnectPtr conn, int rv; =20 VIR_DEBUG("conn=3D%p driver=3D%p vm=3D%p name=3D%s id=3D%d asyncJob=3D= %s " - "migrateFrom=3D%s migrateFd=3D%d migratePath=3D%s " + "incoming=3D%p migrateFd=3D%d migratePath=3D%s " "snapshot=3D%p vmop=3D%d flags=3D0x%x", conn, driver, vm, vm->def->name, vm->def->id, virDomainAsyncJobTypeToString(asyncJob), - NULLSTR(migrateFrom), migrateFd, NULLSTR(migratePath), + incoming, migrateFd, NULLSTR(migratePath), snapshot, vmop, flags); =20 virCheckFlagsGoto(VIR_QEMU_PROCESS_START_COLD | @@ -8376,20 +8375,13 @@ qemuProcessStart(virConnectPtr conn, VIR_QEMU_PROCESS_START_GEN_VMID | VIR_QEMU_PROCESS_START_RESET_NVRAM, cleanup); =20 - if (!migrateFrom && !snapshot) + if (!incoming && !snapshot) flags |=3D VIR_QEMU_PROCESS_START_NEW; =20 if (qemuProcessInit(driver, vm, updatedCPU, - asyncJob, !!migrateFrom, flags) < 0) + asyncJob, !!incoming, flags) < 0) goto cleanup; =20 - if (migrateFrom) { - incoming =3D qemuProcessIncomingDefNew(priv->qemuCaps, NULL, migra= teFrom, - migrateFd, migratePath); - if (!incoming) - goto stop; - } - if (qemuProcessPrepareDomain(driver, vm, flags) < 0) goto stop; =20 @@ -8442,14 +8434,13 @@ qemuProcessStart(virConnectPtr conn, qemuSecurityRestoreSavedStateLabel(driver->securityManager, vm->def, migratePath) < 0) VIR_WARN("failed to restore save state label on %s", migratePath); - qemuProcessIncomingDefFree(incoming); return ret; =20 stop: stopFlags =3D 0; if (!relabel) stopFlags |=3D VIR_QEMU_PROCESS_STOP_NO_RELABEL; - if (migrateFrom) + if (incoming) stopFlags |=3D VIR_QEMU_PROCESS_STOP_MIGRATED; if (priv->mon) qemuMonitorSetDomainLog(priv->mon, NULL, NULL, NULL); @@ -8503,8 +8494,9 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, VIR_AUTOCLOSE intermediatefd =3D -1; g_autoptr(virCommand) cmd =3D NULL; g_autofree char *errbuf =3D NULL; - const char *migrateFrom =3D NULL; + qemuProcessIncomingDef *incoming =3D NULL; int rc =3D 0; + int ret =3D -1; =20 if (data) { if (virSaveCookieParseString(data->cookie, (virObject **)&cookie, @@ -8515,10 +8507,15 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, &errbuf, &cmd) < 0) { return -1; } - - migrateFrom =3D "stdio"; } =20 + /* The fd passed to qemuProcessIncomingDefNew is used to create the mi= gration + * URI, so it must be called after starting the decompression program. + */ + incoming =3D qemuProcessIncomingDefNew(priv->qemuCaps, NULL, "stdio", = *fd, path); + if (!incoming) + return -1; + /* No cookie means libvirt which saved the domain was too old to mess = up * the CPU definitions. */ @@ -8529,7 +8526,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, priv->disableSlirp =3D true; =20 if (qemuProcessStart(conn, driver, vm, cookie ? cookie->cpu : NULL, - asyncJob, migrateFrom, *fd, path, snapshot, + asyncJob, incoming, *fd, path, snapshot, VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, start_flags) =3D=3D 0) *started =3D true; @@ -8541,14 +8538,17 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, =20 virDomainAuditStart(vm, reason, *started); if (!*started || rc < 0) - return -1; + goto cleanup; =20 /* qemuProcessStart doesn't unset the qemu error reporting infrastruct= ure * in case of migration (which is used in this case) so we need to res= et it * so that the handle to virtlogd is not held open unnecessarily */ qemuMonitorSetDomainLog(qemuDomainGetMonitor(vm), NULL, NULL, NULL); + ret =3D 0; =20 - return 0; + cleanup: + qemuProcessIncomingDefFree(incoming); + return ret; } =20 =20 diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index fee00ce53b..a9e0a03a21 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -83,7 +83,7 @@ int qemuProcessStart(virConnectPtr conn, virDomainObj *vm, virCPUDef *updatedCPU, virDomainAsyncJob asyncJob, - const char *migrateFrom, + qemuProcessIncomingDef *incoming, int stdin_fd, const char *stdin_path, virDomainMomentObj *snapshot, --=20 2.43.0