From nobody Tue Sep 9 03:20:41 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=1747323179; cv=none; d=zohomail.com; s=zohoarc; b=RuneeWhTJ7EvCgBFzUKrlpDwMyPdDUEe/SQBEcU1PVkzksud55/lgc1BV1Gu+haijdf8z/PePjSXQ1dYMxiTuMoE5XrKE+cS5KXigRILH+GG3iTHxlDDaOIjEWYlOK9i7SBNHxMtThes2sOqPpSx6HX2qEg/kPCWEwfgXoAwAmI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323179; h=Content-Type: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=1prPx2Gg2fYkGOzbv7DoOBh5SPygCVuiQJPOM6jlcTU=; b=BAlTjQkqGVwn3p3VATPlLdapqqz0L2nIcGbDxCtuskmurkv/YvsA5Z/l6UBlxFv+6aw4rCVyJ4BraeB2nZVkwflULaJX0iosRn/IfjzLJQgKhMcOtM8HGutjZ8+zmhysTK9Bo2iKmUZ3QXERNo0UMQEWXxR4xLOCdzkdEHKBQsg= 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 1747323179180310.2804797609232; Thu, 15 May 2025 08:32:59 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 40B991535; Thu, 15 May 2025 11:32:58 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 5DCE91440; Thu, 15 May 2025 11:29:49 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 31F3011B8; Thu, 15 May 2025 11:29:41 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 EB63713B3 for ; Thu, 15 May 2025 11:29:27 -0400 (EDT) Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-32-EvUnCxNwMNmhIzh0AXRMXg-1; Thu, 15 May 2025 11:29:23 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BB0D019560A2 for ; Thu, 15 May 2025 15:29:22 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.22.37]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B6F6D18003FC; Thu, 15 May 2025 15:29:21 +0000 (UTC) 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_H5, 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=redhat.com; s=mimecast20190719; t=1747322967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7qW1CeOteVOGTc9YABw4pFVq8UifkfqEe3KSGeelbBU=; b=YCoWrpY8ByK4Qw2aClzBokDPV3Qic3L7EBWvNggcDejENokg4KnAjtuPR/Vyx6TwXgSCk1 CUGICpnFkTvZ/KaxIaWFGIGqAw3Idf4btnvodvWMVYo2mxInfwYzXxeC0BA/vSbguRHXAA F0YH+1uVonjmTwrO4QoDfSi4QSInu3I= X-MC-Unique: EvUnCxNwMNmhIzh0AXRMXg-1 X-Mimecast-MFC-AGG-ID: EvUnCxNwMNmhIzh0AXRMXg_1747322962 To: devel@lists.libvirt.org Subject: [PATCH 07/17] qemuProcessStart: Rename 'snapshot' to 'internalSnapshotRevert' Date: Thu, 15 May 2025 17:28:52 +0200 Message-ID: <4095b40a4de17f7a1238e13cefd53a77b7db9c47.1747322588.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 9ZuwihNt93fBJ4oc3PRH5j_sDiKwZ6hRPn8oHaNmnX4_1747322962 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 6BWCH76RBIGW35JK2KF4UR2G7JXXE6VT X-Message-ID-Hash: 6BWCH76RBIGW35JK2KF4UR2G7JXXE6VT X-MailFrom: pkrempa@redhat.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: Peter Krempa 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: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1747323181014116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Make it obvious that the variable is used for internal snapshot reversion by renaming it. This is necessary mainly as the function parameters are not documented, but makes it obvious also if they were. We can also report the name of the sanpshot rather than a pointer that says absolutely nothing to the reader. Signed-off-by: Peter Krempa --- src/qemu/qemu_process.c | 11 ++++++----- src/qemu/qemu_process.h | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d86138aef4..f5543542d5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8472,7 +8472,7 @@ qemuProcessStart(virConnectPtr conn, qemuProcessIncomingDef *incoming, int migrateFd, const char *migratePath, - virDomainMomentObj *snapshot, + virDomainMomentObj *internalSnapshotRevert, qemuMigrationParams *migParams, virNetDevVPortProfileOp vmop, unsigned int flags) @@ -8486,11 +8486,12 @@ qemuProcessStart(virConnectPtr conn, VIR_DEBUG("conn=3D%p driver=3D%p vm=3D%p name=3D%s id=3D%d asyncJob=3D= %s " "incoming=3D%p migrateFd=3D%d migratePath=3D%s " - "snapshot=3D%p vmop=3D%d flags=3D0x%x", + "internalSnapshotRevert=3D%s vmop=3D%d flags=3D0x%x", conn, driver, vm, vm->def->name, vm->def->id, virDomainAsyncJobTypeToString(asyncJob), incoming, migrateFd, NULLSTR(migratePath), - snapshot, vmop, flags); + NULLSTR(internalSnapshotRevert ? internalSnapshotRevert->def= ->name : NULL), + vmop, flags); virCheckFlagsGoto(VIR_QEMU_PROCESS_START_COLD | VIR_QEMU_PROCESS_START_PAUSED | @@ -8498,7 +8499,7 @@ qemuProcessStart(virConnectPtr conn, VIR_QEMU_PROCESS_START_GEN_VMID | VIR_QEMU_PROCESS_START_RESET_NVRAM, cleanup); - if (!incoming && !snapshot) + if (!incoming && !internalSnapshotRevert) flags |=3D VIR_QEMU_PROCESS_START_NEW; if (qemuProcessInit(driver, vm, updatedCPU, @@ -8519,7 +8520,7 @@ qemuProcessStart(virConnectPtr conn, } if ((rv =3D qemuProcessLaunch(conn, driver, vm, asyncJob, incoming, - snapshot, vmop, flags)) < 0) { + internalSnapshotRevert, vmop, flags)) < 0)= { if (rv =3D=3D -2) relabel =3D true; goto stop; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 021dbbd960..6d5f189aa4 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -91,7 +91,7 @@ int qemuProcessStart(virConnectPtr conn, qemuProcessIncomingDef *incoming, int stdin_fd, const char *stdin_path, - virDomainMomentObj *snapshot, + virDomainMomentObj *internalSnapshotRevert, qemuMigrationParams *migParams, virNetDevVPortProfileOp vmop, unsigned int flags); --=20 2.49.0