From nobody Tue Sep 9 23:56:39 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=1737588468; cv=none; d=zohomail.com; s=zohoarc; b=e1eFTXSjMdeHTVAU4y+i/3spDHxn9/q1Mj0P52SRajhGU/AWGPEm76foXWSrKlQxJLDnRQbVnbo2is4oGv7+zna5FvtCW/tV9IuI2GjcELeKD+4lUUJdXg8ENc9Ty1/WpOhlnzWp/TikjfhJQpK4DErugO48LmI/XVZQnQPnTjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737588468; 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=yju653hpeT0cnuPSeACbsZ4OB6tciiWlltMlyA6al7E=; b=miqz3L9pwT7QdRSEfatpT9yN5bhFF/isHmrq866uNXTE1UPPiovkffOO8T+sxTXjS8vKkUqrOHmKJIkDsZMhN46T1luc1uQRSAGoZXARqeCLNN/fv4ooeCDjhgjv95s8dWkowKCa+jOAlA7+mKcHLJ55aYsIvl7SMwSpD3IxaII= 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 1737588468816407.59536494461736; Wed, 22 Jan 2025 15:27:48 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 996) id 57276144F; Wed, 22 Jan 2025 18:27:48 -0500 (EST) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0CC9D13E4; Wed, 22 Jan 2025 18:23:20 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 996) id 9534612F6; Wed, 22 Jan 2025 18:23:13 -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 A408313A0 for ; Wed, 22 Jan 2025 18:22:53 -0500 (EST) Received: by mail-ej1-f45.google.com with SMTP id a640c23a62f3a-ab651f1dd36so71788566b.0 for ; Wed, 22 Jan 2025 15:22:53 -0800 (PST) Received: from localhost (75-169-8-111.slkc.qwest.net. [75.169.8.111]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21c2ce9ed52sm101788525ad.16.2025.01.22.15.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jan 2025 15:22:52 -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=1737588172; x=1738192972; 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=XUDoCQJgtwcuBdVaHL+yxqMdOLhZkjKOxumx9gvNGqI=; b=SITgNZjEKHLb3dL2AJoqeuVZiJF/eqXUFY5lNejV7l9CNh2adIhJ6V4BLO0L0IBzfX Q9M1pfEQ0aCS4w/YQXyn+lHLLK85FdhQna7PCfBu9copl15ipXZjXZb8jAZ0MOsb23hn JZFFOv7nIOTUc3ivp++bhqjkPIc1sCybDBAhPk11wdBvasDicTtNaL4D6c166ikm1y2G iv9BMw/KwJIwAnI21gMqoUAg94ii8eYFnjOK7Oud4S8w28qTmfS6PyC2jXKwnbc5+Y+n QjJUazqjeVdiHER6CrlZWe9Tp4sV4JsqVoFvu9V9O2jDmuTSciSZuv1Grmt2r8wz0tw4 jtAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737588172; x=1738192972; 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=XUDoCQJgtwcuBdVaHL+yxqMdOLhZkjKOxumx9gvNGqI=; b=PqqKqNxcL+c4IfgFkladej6nZmjxejt+bLSEw+QrRlDW1xkrP+LyrQFO5Wm+kQ6cs9 zLbovunt/a3DV1RSV+5nAApdq1PlCcYI64ZS91CNwCLUzT/HKcB3iN8MQGVOuyzN8Gbn JJOnMQ4wf3cRZmaDwDentuJZVMUIL1lvPrwM24TxFKm5adJh9d9b91+y03kVCuW8OEoH hCLqJ1LHR1QnY+IsM/OV0NUsvrj1qdY4Q8xrTS5YQnsJf58t9ZIRqSNghylutNlwL4hI 1RxAQ+5KPW8rwwmx06NdlMbGwe1smTwTQL//YjwRkpZkfFXB/0l0/FRd5ryEYUsMnKYz RIfg== X-Gm-Message-State: AOJu0YwogXqzyggDXxcVhFIk7jzMFwy9jaEdVYB6spXnNA7x/A2p4lnr 28sO/ijilJZhUSeWV2MN5wsKnMnC8oxQOErWpp4DPZJ/6QfAPSBeohtw8+1cOVkSJyJPbdCYdDQ p X-Gm-Gg: ASbGncv1bZA5rF+Hl0+gKUehPNMZmEdZIm4wIMpCQTzie+BHgvsGiOnOG/jUYWTTVed SzCdmQoqktLfsdVBRBu5t5YJ/oEX652ObH26YX0GmItGJsu0M+g1Pte9JdiZUuefHYEP7JFE9Lv 6XgdISfGWpL1Fwh7JxpchCKom/WQA5jcYnc4krSeporSBj0IMSvKztAAJF2QsrfdHE0DMu8eChL TNCtPbDR3bshjfEBabqeJlMDWJmSY2saAvM9orQNWybTVoGKGRfRmpczxB0WDu/FS23pdbDi9N3 hThCrCTTZvaC X-Google-Smtp-Source: AGHT+IHuXoE4IHgS5iB06IzzJl5YxaEDuwBbZpWmyZgM8fAkFr/ZYTz05jot8S1cbg3Hx+PyoT5ESA== X-Received: by 2002:a17:907:7e95:b0:aa6:7354:e926 with SMTP id a640c23a62f3a-ab38b42b49cmr2065663966b.36.1737588172490; Wed, 22 Jan 2025 15:22:52 -0800 (PST) To: devel@lists.libvirt.org Subject: [PATCH V2 12/20] qemu: Move creation of qemuProcessIncomingDef struct Date: Wed, 22 Jan 2025 16:16:46 -0700 Message-ID: <20250122232228.19306-13-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: DKYO6XNASV3LSOTA35LRP6BOZLT3NFTS X-Message-ID-Hash: DKYO6XNASV3LSOTA35LRP6BOZLT3NFTS 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: 1737588469427019000 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 | 44 ++++++++++++++++++++--------------------- src/qemu/qemu_process.h | 2 +- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 6db48b0e7b..1f00c0016d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8295,7 +8295,7 @@ qemuProcessStart(virConnectPtr conn, virDomainObj *vm, virCPUDef *updatedCPU, virDomainAsyncJob asyncJob, - const char *migrateFrom, + qemuProcessIncomingDef *incoming, int migrateFd, const char *migratePath, virDomainMomentObj *snapshot, @@ -8303,7 +8303,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; @@ -8311,11 +8310,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 | @@ -8324,20 +8323,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 @@ -8390,14 +8382,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); @@ -8451,20 +8442,24 @@ 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; + + incoming =3D qemuProcessIncomingDefNew(priv->qemuCaps, NULL, "stdio", + *fd, path); + if (!incoming) + return -1; =20 if (data) { if (virSaveCookieParseString(data->cookie, (virObject **)&cookie, virDomainXMLOptionGetSaveCookie(drive= r->xmlopt)) < 0) - return -1; + goto cleanup; =20 if (qemuSaveImageDecompressionStart(data, fd, &intermediatefd, &errbuf, &cmd) < 0) { - return -1; + goto cleanup; } - - migrateFrom =3D "stdio"; } =20 /* No cookie means libvirt which saved the domain was too old to mess = up @@ -8477,7 +8472,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; @@ -8489,14 +8484,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 12781673c5..1dd6ae23c8 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