From nobody Fri Dec 19 20:16:31 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=1738953816; cv=none; d=zohomail.com; s=zohoarc; b=MuRrz/nADQRotXqJFIix0HA+GeVUiLMqM14avk0D8/0k1zIR3f1XnX5HhjRdlIO3lfUm8cdUGD6yh2c+KXUfQjhC0NugXpWVm2UopnxD2keGsKxZq+iGZL4zHCE78kMfDmdyCvjwpWGiWA+wVAROWI+C+s2yXKVmuNlsXIu5gpg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1738953816; 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=UKsObV2gvbQpwmstReiNdfhQNbrB+Q4dmxS2ZWo4A5I=; b=k2uYS+H2S6hfi7tATf3yO9puv/H8M9pA7cuYIHYhZSPhC46iEXfpP48ZUqeV7PglJ2SHVvdrkvdoEGFTNeVOt5SySJqVPStD7TLK8Km+lXiu9Ml8iBiKMdoJc9d44dBhFjcHgPPZDlhfWG3TUWLirQjTz3Rq8mTC69s5Xyp/t5k= 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 1738953816610115.29722134914141; Fri, 7 Feb 2025 10:43:36 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9760E164F; Fri, 7 Feb 2025 13:43:35 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id AA968180C; Fri, 7 Feb 2025 13:38:26 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id BFB1E14D0; Fri, 7 Feb 2025 13:38:14 -0500 (EST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 8B87614D0 for ; Fri, 7 Feb 2025 13:37:58 -0500 (EST) Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-385dece873cso1088072f8f.0 for ; Fri, 07 Feb 2025 10:37:58 -0800 (PST) Received: from localhost (205-201-32-8.scinternet.net. [205.201.32.8]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fa099f5c06sm3601079a91.2.2025.02.07.10.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Feb 2025 10:37:56 -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=1738953477; x=1739558277; 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=H7N2jGtHTpcqwfC+9FMuvtFBHvtlIkwkpfyHC5ELiPs=; b=EOMHWDhTlm2F9ICjN5ag9rYt+fo7bnk2Tn/SDCD/PIB8QcutPyQ2z9Egb7ZL9nRJPi d4A88mBuwabs8k43xwgKproc6kL6LRDHuUlMC6lOtSEXrdiLxfLGX9ljmSlBPIzUw4B3 o3lASb40XxMpvODCLHpO3OIwB8D+nF99HGHDdNrZ8zUAW5frCZayLyYeE44/YUa48VZj 71iL0qH4mca3Z4nUXM0fEcFAwJr9KjW3Cf9FBApqOvOzVwdkaP/7V4WU91T5bn/qlRQb 3BCRHmIMpSyqM6baReSb8rypSbxPGtgTMEgrzfgwQdJOmZt6oaDzI1gj1ngqZCMIvo3t BbJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738953477; x=1739558277; 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=H7N2jGtHTpcqwfC+9FMuvtFBHvtlIkwkpfyHC5ELiPs=; b=ANKV0JEf/7oSaqbxsSxYulV71AqQXblQG8JtuoVwQvYN3XfTBwPvaTQ7cq7EK6hS6T /cwQrS+5Qy8yHF93HBzU9OWccWFjqv3UBDHqKf3a3aBQUrlOsiB466D4ubASTuyl4fsv ESLDgkEI25Z/vhaKXnPcFd60rkyzYHYtrZThcc7TjbhrJjlkbYVfQtKsm43GS+szZdIy pDg6M/bMIsoaWqCTeYr6UJNN8hqyoEBFjuoMAIe84k2g54YAJYRig4iq7PO8zUWxdcCT xBfggDboscPGFqPMkzq939vfjVrYWi8nNghAfuGaHIq3eqSj5jUBCwBk7lztTmiog2fG LMiQ== X-Gm-Message-State: AOJu0Yw5jf2VqJ93bscQhlEHfAxu+eljKboO4SrVMKxBcMvzP61sJ5Ds q9/ZhhbwrcrkI+D0GiKIyR/wXWo/hep0AbZr5W/jiGKhwueNEe3GXIUBJhLBbBGC0bmwzwQ1Yop 9 X-Gm-Gg: ASbGncs2ztuzSYzNQ1FvQQPJu/m8bKHj4PfZ7VFcruBP2icdLIpJVEVP4rAjUSiMqSr 8FpM+bsKYi6kB1/WVrOYp4AxN66opjSNYKUmIPSuBwaAcKPc1zSge/HZJDH83cVqlMCP0DFkHX1 hkVxz0iqRDbs6OUz/Mi0ktYW7+8aYWqzsfuk9ui3jKN0EkdXjN75tWCaHSmwKJ6As25MlXzdC9Z 3CMmcWaIp4qwVyHMLEfltqk9bzDplvBuiGTwGpL1CWR2rk7P/KTOwJ+DtL8FVxIlXzhbfBgh3XJ u/KCPwU7FqnXO+CX00X4UrYLNQLWaQRByg== X-Google-Smtp-Source: AGHT+IHDykTxdQ0uJm2kXnSPKD2k2OxUPSjMLUFKwtaM5H9ucaMjN4406xwj2Vblv6UiTZzP1OPIAQ== X-Received: by 2002:a5d:5985:0:b0:385:e30a:e0f7 with SMTP id ffacd0b85a97d-38dc932dd45mr2767285f8f.22.1738953477320; Fri, 07 Feb 2025 10:37:57 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V3 11/19] qemu: Move creation of qemuProcessIncomingDef struct Date: Fri, 7 Feb 2025 11:27:22 -0700 Message-ID: <20250207183730.21686-12-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: VGZQDKBQJYYL7QWIF6MCEUP7J3JSWP23 X-Message-ID-Hash: VGZQDKBQJYYL7QWIF6MCEUP7J3JSWP23 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: 1738953817827019100 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 d015285b0d..524b23fea8 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8315,7 +8315,7 @@ qemuProcessStart(virConnectPtr conn, virDomainObj *vm, virCPUDef *updatedCPU, virDomainAsyncJob asyncJob, - const char *migrateFrom, + qemuProcessIncomingDef *incoming, int migrateFd, const char *migratePath, virDomainMomentObj *snapshot, @@ -8323,7 +8323,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; @@ -8331,11 +8330,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 | @@ -8344,20 +8343,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 @@ -8410,14 +8402,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); @@ -8471,8 +8462,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, @@ -8483,10 +8475,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. */ @@ -8497,7 +8494,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; @@ -8509,14 +8506,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