From nobody Fri Dec 12 12:53:24 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=1765363069; cv=none; d=zohomail.com; s=zohoarc; b=L32NOuu/pPrQxbQIAgRrxToNpGfhIbLrP3TZE8rKQLYZM+ah3KO0cMxCiuQHBRR6vKyYdWrLJZPkjRBtbBURWY69E0E36slCmqzwK1tQq2zmj828jbJ+kzIuCOIT3TyL/PxB1tYpYUD13WdArWPBDo92kJeaqOJpk8kIT3ilacY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363069; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=ySaBJyGMlwmjGY8KFNomLmGvnviRRlVu22hEy9rbvnw=; b=oJrBqRxjQbripxV1Gh/Oek3Xm8mDfl4CVdqp7Xs/eWQM6SyWsu67YoBCsyRYtih4TBHWDIgpFDWddbuC2/HExd4W6pabhJnwUXvEy4OkobTCwQzeoifvFVBweQHarWLUsknMLEjymRk90SetTntEpGqAbpSZZufPhj5Y6wmcdoE= 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 1765363069774200.83125464112197; Wed, 10 Dec 2025 02:37:49 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id A308E41B60; Wed, 10 Dec 2025 05:37:48 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 094FB43DD2; Wed, 10 Dec 2025 05:36:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2043F41B43; Wed, 10 Dec 2025 05:32:39 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 76A9041B42 for ; Wed, 10 Dec 2025 05:32:37 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-596-BAkEfKM-OjOfbWRSwH8TMw-1; Wed, 10 Dec 2025 05:32:35 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D7F0818002DE for ; Wed, 10 Dec 2025 10:32:34 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2A42330001A5 for ; Wed, 10 Dec 2025 10:32:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ySaBJyGMlwmjGY8KFNomLmGvnviRRlVu22hEy9rbvnw=; b=Hhddv39BTzf3njv7jHy4/Ps42i/PIWp2Y0PSFU7LQTSESA9pu1jIHHmU66cArKGI1Ekglg lgZILp1HnzGJeu52C+rUlyF5WP/ko6ANuNSN4oRbCtfB56jkUsRkMnYw/ssh6JExCt5bMx oOeN45tMakz2pUtsjja51Y9e6nG2L7k= X-MC-Unique: BAkEfKM-OjOfbWRSwH8TMw-1 X-Mimecast-MFC-AGG-ID: BAkEfKM-OjOfbWRSwH8TMw_1765362755 To: devel@lists.libvirt.org Subject: [PATCH 01/10] qemu: snapshot: Don't overwrite 'ret' in qemuSnapshotCreateActiveExternal Date: Wed, 10 Dec 2025 11:32:22 +0100 Message-ID: <84efdfe05e52f7398603fe1ef2ea6e2ed74deee6.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: b2Xe8IJVynuQt7ZrvM5RMsMjhDPR6pN3UGQZoWwv5Ok_1765362755 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ADZVDVPXXEN2RXSHRXKJG4J5YDJESME7 X-Message-ID-Hash: ADZVDVPXXEN2RXSHRXKJG4J5YDJESME7 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363072785158500 Content-Type: text/plain; charset="utf-8" From: Nikolay Shirokovskiy Both qemuSaveImageCreate and qemuSnapshotCreateActiveExternalDisks follow the usual convention of returning 0 on success and -1 on error so there's no need store the values in 'ret'. Signed-off-by: Nikolay Shirokovskiy Signed-off-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5b0b52e2ba..5ceaff3554 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1756,9 +1756,9 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, if (!(snap_params =3D qemuMigrationParamsNew())) goto cleanup; - if ((ret =3D qemuSaveImageCreate(driver, vm, snapdef->memorysnapsh= otfile, - data, compressor, snap_params, 0, - VIR_ASYNC_JOB_SNAPSHOT)) < 0) + if (qemuSaveImageCreate(driver, vm, snapdef->memorysnapshotfile, + data, compressor, snap_params, 0, + VIR_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; /* the memory image was created, remove it on errors */ @@ -1775,9 +1775,9 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, qemuSnapshotCreateActiveExternalDisksManual(vm, snap, VIR_ASYNC_JO= B_SNAPSHOT) < 0) goto cleanup; - if ((ret =3D qemuSnapshotCreateActiveExternalDisks(vm, snap, - blockNamedNodeData, f= lags, - VIR_ASYNC_JOB_SNAPSHO= T)) < 0) + if (qemuSnapshotCreateActiveExternalDisks(vm, snap, + blockNamedNodeData, flags, + VIR_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; /* the snapshot is complete now */ --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363171; cv=none; d=zohomail.com; s=zohoarc; b=UwvxnYwozZGYo9sMmXZTuk69H8swqBZQgLi0ktdVRwoHrRE2wPUSYGEvz9vsYGeL4Wiad5hk+CsF1nAwOlSDuU2q/bWDMYkgsNiAn2Tsezgkw6sOrrVtviSqB1mJqccjzMjeo+spEJE7qiiKIFSEWlrU/c9ijSUp0SKkGuCNxO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363171; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=35+GL7RNnmKAyQLSD1PNrO1+1o8Sa3oGvW5pBEdpL8o=; b=eXWPlyNclBo0c1gJ90o3esXQwnVTsff4kLmEQ4FVMXIBkzah8RR5pvL1CTEJcPyCQ5QrN9dmVnCRu1xecGg0Win1GNiVjUBOtWOrv/BYHgHNEmweqY5fvkViXoETiyJ4p+L7QA/JlcoNn0zCSBxk1tL2zmi/XLSp6zwGjAe+Rgg= 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 1765363171624644.8955369259105; Wed, 10 Dec 2025 02:39:31 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id CE6DF41BEA; Wed, 10 Dec 2025 05:39:30 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C249B43DED; Wed, 10 Dec 2025 05:38:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2EF9F41B42; Wed, 10 Dec 2025 05:32:39 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3802641B45 for ; Wed, 10 Dec 2025 05:32:38 -0500 (EST) Received: from mx-prod-mc-05.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-640-0cuWXrMqO8-4NdqduredwA-1; Wed, 10 Dec 2025 05:32:36 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0922B195609D for ; Wed, 10 Dec 2025 10:32:36 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5528830001A5 for ; Wed, 10 Dec 2025 10:32:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=35+GL7RNnmKAyQLSD1PNrO1+1o8Sa3oGvW5pBEdpL8o=; b=M0h6Z4zmAL4jwXfmv6kA/QYzBJbbc0shPM4J2OZBuH8FKhvORq5eEMj31AnHlCsmIaLLNh rQI6l/8Bz2MArYswseennPRyadPAtdoBv8FDXVTLHFe9Unctb6T60i/aHFo3TqYHPcjxYF hRgBpwgGcLpJYpdjsciPzH/6FVXtYwU= X-MC-Unique: 0cuWXrMqO8-4NdqduredwA-1 X-Mimecast-MFC-AGG-ID: 0cuWXrMqO8-4NdqduredwA_1765362756 To: devel@lists.libvirt.org Subject: [PATCH 02/10] qemuHotplugAttachDBusVMState: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:23 +0100 Message-ID: <90972bea5d10134e90dc95ff4f8210f23d9a3db7.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 70Q546BALSvUIwDuu_aM2PXT7oAPPQ2RWR5AiieVf3w_1765362756 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 32K3DPHNQTDWBL4O4NBA4HX6JKCXFYBO X-Message-ID-Hash: 32K3DPHNQTDWBL4O4NBA4HX6JKCXFYBO X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363172961158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_hotplug.c | 6 ++---- src/qemu/qemu_hotplug.h | 3 +-- src/qemu/qemu_migration.c | 9 ++++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fb426deb1a..fccbef5d0c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -330,7 +330,6 @@ qemuHotplugWaitForTrayEject(virDomainObj *vm, /** * qemuHotplugAttachDBusVMState: - * @driver: QEMU driver object * @vm: domain object * @asyncJob: asynchronous job identifier * @@ -339,8 +338,7 @@ qemuHotplugWaitForTrayEject(virDomainObj *vm, * Returns: 0 on success, -1 on error. */ int -qemuHotplugAttachDBusVMState(virQEMUDriver *driver, - virDomainObj *vm, +qemuHotplugAttachDBusVMState(virDomainObj *vm, virDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -355,7 +353,7 @@ qemuHotplugAttachDBusVMState(virQEMUDriver *driver, return 0; } - if (!(props =3D qemuBuildDBusVMStateInfoProps(driver, vm))) + if (!(props =3D qemuBuildDBusVMStateInfoProps(priv->driver, vm))) return -1; if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index fb0b5b6cd7..e6c90253e4 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -120,8 +120,7 @@ unsigned long long qemuDomainGetUnplugTimeout(virDomainObj *vm) ATTRIBUTE_MOCKABLE; int -qemuHotplugAttachDBusVMState(virQEMUDriver *driver, - virDomainObj *vm, +qemuHotplugAttachDBusVMState(virDomainObj *vm, virDomainAsyncJob asyncJob); int diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1371742529..a64a98046a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4602,15 +4602,14 @@ qemuMigrationSrcContinue(virDomainObj *vm, static int -qemuMigrationSetDBusVMState(virQEMUDriver *driver, - virDomainObj *vm) +qemuMigrationSetDBusVMState(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; if (priv->dbusVMStateIds) { int rv; - if (qemuHotplugAttachDBusVMState(driver, vm, VIR_ASYNC_JOB_NONE) <= 0) + if (qemuHotplugAttachDBusVMState(vm, VIR_ASYNC_JOB_NONE) < 0) return -1; if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_NONE) < 0) @@ -5097,7 +5096,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, } } - if (qemuMigrationSetDBusVMState(driver, vm) < 0) + if (qemuMigrationSetDBusVMState(vm) < 0) goto error; /* Before EnterMonitor, since already qemuProcessStopCPUs does that */ @@ -7268,7 +7267,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, unsigned long saveMigBandwidth =3D priv->migMaxBandwidth; virErrorPtr orig_err =3D NULL; - if (qemuMigrationSetDBusVMState(driver, vm) < 0) + if (qemuMigrationSetDBusVMState(vm) < 0) return -1; /* Increase migration bandwidth to unlimited since target is a file. --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363235; cv=none; d=zohomail.com; s=zohoarc; b=hcK/6Qkq9HzMOhm7S+WLzVr9lao92nqWfJD977nj7gfUxdifUbLoTZ2d1ZdkYPOJ5ceyKERTH1mw376nsbBRhDKsuh18NLDKU/HXdoXH3BncBmR+nvWdlw32Zxj1uUrGHFXuNn3IY0HJhogIMNUVv5D5QpRW7LKmHxne0skGkl0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363235; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=90Xtt8Qsc8cP5ZejXrQSKV4HDx0k332VVABBTBx5n6s=; b=C1blZgbD+PbR/gvh4f4+FbHd5kNLaUtnV/AlqRqgvyHxRbdkrBM4LV9rm6Icp5jWeGLoX5xt1k1PSeh+h+mL8dmA2KV/dU94fwzr/tSpmPNL2RnPnSRO2U40Oci/L4zZT7LNWJ43H+vrHK98F4QeY0MdkwuLdgP68RaIFaqrYYs= 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 1765363235628659.5215880183733; Wed, 10 Dec 2025 02:40:35 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 5005F41C4E; Wed, 10 Dec 2025 05:40:26 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 6095041C1C; Wed, 10 Dec 2025 05:39:38 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 7ACCD41B41; Wed, 10 Dec 2025 05:32:40 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id C394B41B42 for ; Wed, 10 Dec 2025 05:32:39 -0500 (EST) Received: from mx-prod-mc-05.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-529-GdROKPPOODm178gJz7Ny0Q-1; Wed, 10 Dec 2025 05:32:38 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 389551956096 for ; Wed, 10 Dec 2025 10:32:37 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7C83830001A5 for ; Wed, 10 Dec 2025 10:32:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=90Xtt8Qsc8cP5ZejXrQSKV4HDx0k332VVABBTBx5n6s=; b=dzDszmr4YtRHOsnaZEnosqIQBvk1gdah7hn89BAznO7nwONferzLn3iVn/sZ2um9v1Q0ja lTZcMptzMmoowIij7MT8WywAfwKyXjxnN47oN1r7arV2LMq45CquWrsd6/1mzOgmZ2bgqw Yi77AQhTzM3Z/bJ2nREi37AvJDUGtyA= X-MC-Unique: GdROKPPOODm178gJz7Ny0Q-1 X-Mimecast-MFC-AGG-ID: GdROKPPOODm178gJz7Ny0Q_1765362757 To: devel@lists.libvirt.org Subject: [PATCH 03/10] qemuMigrationSrcToLegacyFile: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:24 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: LEezoVrnn6EfuClNTacbiXPMq1r1v-QcoPzPQJ_heMk_1765362757 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: S6GGJENEFALWBZ55SRYCI6B4M5MPRN6R X-Message-ID-Hash: S6GGJENEFALWBZ55SRYCI6B4M5MPRN6R X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363237226158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a64a98046a..32afc788ad 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7142,8 +7142,7 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver, static int -qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationSrcToLegacyFile(virDomainObj *vm, int fd, virCommand *compressor, virDomainAsyncJob asyncJob) @@ -7160,7 +7159,7 @@ qemuMigrationSrcToLegacyFile(virQEMUDriver *driver, * doesn't have to open() the file, so while we still have to * grant SELinux access, we can do it on fd and avoid cleanup * later, as well as skip futzing with cgroup. */ - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def, compressor ? pipeFD[1] : fd) < 0) goto cleanup; @@ -7294,7 +7293,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, qemuMigrationParamsCapEnabled(migParams, QEMU_MIGRATION_CAP_MAPPED= _RAM)) rc =3D qemuMigrationSrcToSparseFile(driver, vm, path, fd, bypassCa= che, asyncJob); else - rc =3D qemuMigrationSrcToLegacyFile(driver, vm, *fd, compressor, a= syncJob); + rc =3D qemuMigrationSrcToLegacyFile(vm, *fd, compressor, asyncJob); if (rc < 0) goto cleanup; --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363333; cv=none; d=zohomail.com; s=zohoarc; b=QEwTToaQUqO/uACzEzBMM47dtZU318vhKq+ZD/1nKTI0uI1gN45FJqUXxmlqoFgdU5+bx2z37etNi541zelMuBl0kn3gk2J1x6eUa8jvg4DB/ClEGXGQhrYcYu9UuRMjkwOu7dFmhZPZli2prvAFEpURuJVngYqzvb6jrxhJ3Ro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363333; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=bDLjRjKIDkFrCEiS07KjuuTIR0LInuQnNJIyNVKOPTo=; b=HzFUyk9QMIGOmqLTN0a1IHdoQCoqaE8tKCgXxWwfTgck8cUgcOtwGn2aZZpryFgCoLSD+te5HN6KnY/Yo22la5iGTK518QYNrJFaVsse+u95ZDHLJPJgDDWe2XF52rtPTyHC11kJ0EgDMYUsQ9f4aYLJ/s9ooplaAaSG6sTwy7E= 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 1765363333109266.07475092465495; Wed, 10 Dec 2025 02:42:13 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 10EEC41C9A; Wed, 10 Dec 2025 05:42:06 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0CDC841E58; Wed, 10 Dec 2025 05:39:51 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 35D2A41B41; Wed, 10 Dec 2025 05:32:41 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8F76741B42 for ; Wed, 10 Dec 2025 05:32:40 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-423-q8zAR_03MI-iJLyJJdgK-A-1; Wed, 10 Dec 2025 05:32:39 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 51A0C18002DE for ; Wed, 10 Dec 2025 10:32:38 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9DD4930001A5 for ; Wed, 10 Dec 2025 10:32:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bDLjRjKIDkFrCEiS07KjuuTIR0LInuQnNJIyNVKOPTo=; b=Ay8CX3kjX59I/yd6vANU+h1qq5WsesA73tu/8O3M/4JlFvaO008x/axF8SfX+W2vKnxFTY gkrakW4I2xGKc3VSSXaKxmM4UviBbhS1hv/R9YMAyI3WXFV8k8ltv2AJVex5CcCmdBwUh2 x42XiyQSoUx63LJKAalfdpAyKwcmM1M= X-MC-Unique: q8zAR_03MI-iJLyJJdgK-A-1 X-Mimecast-MFC-AGG-ID: q8zAR_03MI-iJLyJJdgK-A_1765362758 To: devel@lists.libvirt.org Subject: [PATCH 04/10] qemuDomainEventEmitJobCompleted: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:25 +0100 Message-ID: <7e49299c6f1cd2b613d7c4504ff2bc64c87a1d20.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 3SlUBrONMWIZpvZRdYoYAyBGAYhTgMjmZs1mKvmrREA_1765362758 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CQFOECROLIZRAWGQ3PLFWW6W4OG4MGBD X-Message-ID-Hash: CQFOECROLIZRAWGQ3PLFWW6W4OG4MGBD X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363333529158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_backup.c | 2 +- src/qemu/qemu_domainjob.c | 6 +++--- src/qemu/qemu_domainjob.h | 3 +-- src/qemu/qemu_migration.c | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c index c3566bcd57..44514d08fc 100644 --- a/src/qemu/qemu_backup.c +++ b/src/qemu/qemu_backup.c @@ -619,7 +619,7 @@ qemuBackupJobTerminate(virDomainObj *vm, vm->job->completed->status =3D jobstatus; vm->job->completed->errmsg =3D g_strdup(priv->backup->errmsg); - qemuDomainEventEmitJobCompleted(priv->driver, vm); + qemuDomainEventEmitJobCompleted(vm); } g_clear_pointer(&priv->backup, virDomainBackupDefFree); diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c index afea1ea57a..e5236c9778 100644 --- a/src/qemu/qemu_domainjob.c +++ b/src/qemu/qemu_domainjob.c @@ -95,9 +95,9 @@ qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, void -qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, - virDomainObj *vm) +qemuDomainEventEmitJobCompleted(virDomainObj *vm) { + qemuDomainObjPrivate *priv =3D vm->privateData; virObjectEvent *event; virTypedParameterPtr params =3D NULL; int nparams =3D 0; @@ -113,7 +113,7 @@ qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, } event =3D virDomainEventJobCompletedNewFromObj(vm, params, nparams); - virObjectEventStateQueue(driver->domainEventState, event); + virObjectEventStateQueue(priv->driver->domainEventState, event); } diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h index c3de401aa5..bd6731abb5 100644 --- a/src/qemu/qemu_domainjob.h +++ b/src/qemu/qemu_domainjob.h @@ -66,8 +66,7 @@ const char *qemuDomainAsyncJobPhaseToString(virDomainAsyn= cJob job, int qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job, const char *phase); -void qemuDomainEventEmitJobCompleted(virQEMUDriver *driver, - virDomainObj *vm); +void qemuDomainEventEmitJobCompleted(virDomainObj *vm); void qemuDomainObjAbortAsyncJob(virDomainObj *obj); void qemuDomainObjSetJobPhase(virDomainObj *obj, diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 32afc788ad..b2d67a1e74 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4122,7 +4122,7 @@ qemuMigrationSrcComplete(virQEMUDriver *driver, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_MIG= RATED); virObjectEventStateQueue(driver->domainEventState, event); - qemuDomainEventEmitJobCompleted(driver, vm); + qemuDomainEventEmitJobCompleted(vm); priv->preMigrationMemlock =3D 0; } @@ -7313,7 +7313,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, if (compressor && virCommandWait(compressor, NULL) < 0) goto cleanup; - qemuDomainEventEmitJobCompleted(driver, vm); + qemuDomainEventEmitJobCompleted(vm); ret =3D 0; cleanup: --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363399; cv=none; d=zohomail.com; s=zohoarc; b=fmITgjTs6PUsjNDKCQhSM5Lx8JaDgQ4I2D50rlL5sHzZ5CLp/jG4zBYg9NF3s6M4HludgJGzrQ4VU9Dy6ZVL2uK+3VD+g0qeA/WjPXooVxrLS79SG1CXgBLysKbJGI3A3hin8vvhl68ouDO+p8T0l85WWaOqUjYfYIg0aurrTT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363399; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=ypirB31t1uyFxPfdZ1OT321MVwok+3T3SdfgXZeEp6I=; b=SPEqTUHcbpC3+CQVBh4w+/m4EkGbUSW6Hnzdaf6aJ4iGb0YRQUCf2eeLOCsAPrxqOi9EhT8cg9LtznWHDUxJC22mCRndRH7HM2hQSL7hw0+u7HhvvZ72Uo0iCCAhSaWsUtt3qbVy0Oi5bpbVMJ7MD78ePhPrndVsa35x31wwvVs= 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 1765363399898266.2047205561312; Wed, 10 Dec 2025 02:43:19 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id BC3ED3FB97; Wed, 10 Dec 2025 05:43:17 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C2D7241B50; Wed, 10 Dec 2025 05:39:57 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 6A3C241B42; Wed, 10 Dec 2025 05:32:42 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id D396F41B41 for ; Wed, 10 Dec 2025 05:32:41 -0500 (EST) Received: from mx-prod-mc-01.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-539-CRf2AC70PRC5hqHYs53e8g-1; Wed, 10 Dec 2025 05:32:40 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 712A61956089 for ; Wed, 10 Dec 2025 10:32:39 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BCFC730001A5 for ; Wed, 10 Dec 2025 10:32:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ypirB31t1uyFxPfdZ1OT321MVwok+3T3SdfgXZeEp6I=; b=eT2b9jXY9+bLaCGQKrk7uULO7uUNMawBJYZ7vwWmKiKGZPn2/SEWmgH7gWDU0rAFDNwigJ epPuVzGDmI+z8PNGRWucQclGUZNowfqyKf0/f4IMlzzQLpWcD2FU3rW0wIPtTSJpTJCXtW 94VVsNScirjBfKDZBCnsvZd16p91dWI= X-MC-Unique: CRf2AC70PRC5hqHYs53e8g-1 X-Mimecast-MFC-AGG-ID: CRf2AC70PRC5hqHYs53e8g_1765362759 To: devel@lists.libvirt.org Subject: [PATCH 05/10] qemuMigrationSrcToSparseFile: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:26 +0100 Message-ID: <2b059a1947551d5620e84d4ed0cfa574893e0373.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: lUKkDsJ29N4N57FWXrvzlLiBUv-ZXxvpPKl03no7194_1765362759 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3ILCUPA2JN5HO43UX5MHHEEJMQ6LUJNY X-Message-ID-Hash: 3ILCUPA2JN5HO43UX5MHHEEJMQ6LUJNY X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363401835158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_migration.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index b2d67a1e74..a0ec2f5ff3 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7204,14 +7204,14 @@ qemuMigrationSrcToLegacyFile(virDomainObj *vm, static int -qemuMigrationSrcToSparseFile(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationSrcToSparseFile(virDomainObj *vm, const char *path, int *fd, bool bypassCache, virDomainAsyncJob asyncJob) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); VIR_AUTOCLOSE directFd =3D -1; int directFlag =3D 0; bool needUnlink =3D false; @@ -7233,12 +7233,14 @@ qemuMigrationSrcToSparseFile(virQEMUDriver *driver, if (directFd < 0) return -1; - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, = directFd) < 0) + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm-= >def, + directFd) < 0) return -1; } - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, *fd)= < 0) + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def, + *fd) < 0) return -1; if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) @@ -7252,7 +7254,8 @@ qemuMigrationSrcToSparseFile(virQEMUDriver *driver, /* Helper function called while vm is active. */ int -qemuMigrationSrcToFile(virQEMUDriver *driver, virDomainObj *vm, +qemuMigrationSrcToFile(virQEMUDriver *driver G_GNUC_UNUSED, + virDomainObj *vm, const char *path, int *fd, virCommand *compressor, @@ -7291,7 +7294,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, if (migParams && qemuMigrationParamsCapEnabled(migParams, QEMU_MIGRATION_CAP_MAPPED= _RAM)) - rc =3D qemuMigrationSrcToSparseFile(driver, vm, path, fd, bypassCa= che, asyncJob); + rc =3D qemuMigrationSrcToSparseFile(vm, path, fd, bypassCache, asy= ncJob); else rc =3D qemuMigrationSrcToLegacyFile(vm, *fd, compressor, asyncJob); --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363469; cv=none; d=zohomail.com; s=zohoarc; b=CszybLTC+LhKKdu3lksUJ6hFtdoKMscGu3UQ9XvtaM5b8tM9/DQyJq25fJn3/HF50222RQ66WhqUteZOkHBBFFyfjjEi1AuTnF7HdyVxc4Giux1s/4YjqIWNUipv3iDwIQBhbZoD+u9WkcR4zbP5aFxf1Me3Z6siyf9VjQ3cd2c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363469; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=pg4ijA+CCuAzHLP37/8tKoNoJu8BfaiX7taE5/s/YZA=; b=ja2DP+I778QD6Yl1qWYTVWeiCD1DKzoEu+GQvk5clJUO0Ea1vhsEvhxzUR4GHSG5zxVm0OKAG1i7and5j8osTdPBXIUHdJ1TTv5N8GW0cach4om3CVIqYkO2hOLW9Pkf+84HueSEFX1E418rn6iSAWidlkoYqBUROTqATza03pU= 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 1765363469093412.0774075798872; Wed, 10 Dec 2025 02:44:29 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 32E3943E40; Wed, 10 Dec 2025 05:44:27 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C3F9543F7C; Wed, 10 Dec 2025 05:40:04 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id BCFBE41B41; Wed, 10 Dec 2025 05:32:43 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2C34B41B41 for ; Wed, 10 Dec 2025 05:32:43 -0500 (EST) Received: from mx-prod-mc-01.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-278-LcsnRoQCOsmai0UictBLKg-1; Wed, 10 Dec 2025 05:32:41 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 91794195609F for ; Wed, 10 Dec 2025 10:32:40 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DBAA830001A5 for ; Wed, 10 Dec 2025 10:32:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pg4ijA+CCuAzHLP37/8tKoNoJu8BfaiX7taE5/s/YZA=; b=LOgYlFYN+3QYDFkpu2Or0QPmqS91ysi5dQyc4BILzHfIzPQpd4YO57PPFS9ZciJzOrqdw0 qH0AiVNDCiSXnNGKaJEc/xJ8Wom0lSQX7V1Gsz2pukiYbEw9xT1fx1vdf8PqweGa1o+sYO R7+gWfb6Z4BoHWsUfUESQ0ZR27Y3xfc= X-MC-Unique: LcsnRoQCOsmai0UictBLKg-1 X-Mimecast-MFC-AGG-ID: LcsnRoQCOsmai0UictBLKg_1765362760 To: devel@lists.libvirt.org Subject: [PATCH 06/10] qemuMigrationSrcToFile: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:27 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: FBMHIF5_f3vroTVLVELyEOsQVu6xE3_4yapg20b7wt4_1765362760 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: SZU5SVBSKXKQLXY522Y26BHVIAK2FOVB X-Message-ID-Hash: SZU5SVBSKXKQLXY522Y26BHVIAK2FOVB X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363470001158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_migration.c | 3 +-- src/qemu/qemu_migration.h | 5 ++--- src/qemu/qemu_saveimage.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 3c6dd97c04..abe91b303f 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3136,7 +3136,7 @@ doCoreDump(virQEMUDriver *driver, if (!(dump_params =3D qemuMigrationParamsNew())) goto cleanup; - if (qemuMigrationSrcToFile(driver, vm, path, &fd, compressor, + if (qemuMigrationSrcToFile(vm, path, &fd, compressor, dump_params, (dump_flags & VIR_DUMP_BYPASS_CACHE), VIR_ASYNC_JOB_DUMP) < 0) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a0ec2f5ff3..8ae1e4e843 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -7254,8 +7254,7 @@ qemuMigrationSrcToSparseFile(virDomainObj *vm, /* Helper function called while vm is active. */ int -qemuMigrationSrcToFile(virQEMUDriver *driver G_GNUC_UNUSED, - virDomainObj *vm, +qemuMigrationSrcToFile(virDomainObj *vm, const char *path, int *fd, virCommand *compressor, diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 51341f453d..db03144207 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -238,15 +238,14 @@ qemuMigrationSrcIsAllowed(virDomainObj *vm, unsigned int flags); int -qemuMigrationSrcToFile(virQEMUDriver *driver, - virDomainObj *vm, +qemuMigrationSrcToFile(virDomainObj *vm, const char *path, int *fd, virCommand *compressor, qemuMigrationParams *migParams, bool bypassCache, virDomainAsyncJob asyncJob) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int qemuMigrationSrcCancelUnattended(virDomainObj *vm, diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 1b68a09595..c5620c82c5 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -501,7 +501,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, goto cleanup; /* Perform the migration */ - if (qemuMigrationSrcToFile(driver, vm, path, &fd, compressor, savePara= ms, + if (qemuMigrationSrcToFile(vm, path, &fd, compressor, saveParams, (flags & VIR_DOMAIN_SAVE_BYPASS_CACHE), asyncJob) < 0) goto cleanup; --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363537; cv=none; d=zohomail.com; s=zohoarc; b=E9+DmD5ZfH3uqhI8BygdKKmJW4JF4OqZgremA4yo80r60okPghRrq41HtAT4l9Qa62M7rp8zFkmrk5Y3VAoGB8xotXeFoH/tDCAzD+fFu/BADjOJZRQsY6ybxTg1SuELhIdk/0SdttsWUE3VwQ0eRLG21BxRCTDcQy9FQp7wLs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363537; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=M+HqnoyCX1Xx2hUr22A2XFmigfeC8VXdhVgas5Uo+BE=; b=fS9qX2cZF1hmE1O5qXmROyT1MIzY3zmNqbxARlWbbjlFvLupo4M1k1ZTrqn17ta328ZjqPtUyKhNTYYeSjX83IZIlF3KicA14UunFCpJcqt9kPzvrLNgMP2KnpjRxQriEzSnJbiYtmKvQCsMsr1RYMQKri6NfECCmw87mpTbEcU= 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 1765363537843104.20573000211868; Wed, 10 Dec 2025 02:45:37 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id D471D41C37; Wed, 10 Dec 2025 05:45:36 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0393441CA5; Wed, 10 Dec 2025 05:40:15 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 00CA841B32; Wed, 10 Dec 2025 05:32:44 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 2F1A041B41 for ; Wed, 10 Dec 2025 05:32:44 -0500 (EST) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-283-97fSuVMKMFqiYcPzsTH04w-1; Wed, 10 Dec 2025 05:32:42 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B5D871800343 for ; Wed, 10 Dec 2025 10:32:41 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 07EEC30001A5 for ; Wed, 10 Dec 2025 10:32:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=M+HqnoyCX1Xx2hUr22A2XFmigfeC8VXdhVgas5Uo+BE=; b=iHRYi4q6NFCAZ0HeLIt7i8nrPmKUUPBRD68/ZUjgiLeMOTQb63F9ECnYzCTLa1IWIvJzCM Q63jKUiE5oV3A4kq9dTf1aw5ZoeuiU459AWsXNDqrepER7EfnWIUgqpMrpxgj28BtkL8s1 aoPxmKSOr/hZeEz/kEMGgkT2oxJ5OZI= X-MC-Unique: 97fSuVMKMFqiYcPzsTH04w-1 X-Mimecast-MFC-AGG-ID: 97fSuVMKMFqiYcPzsTH04w_1765362761 To: devel@lists.libvirt.org Subject: [PATCH 07/10] qemuSaveImageCreateFd: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:28 +0100 Message-ID: <79b99df73879ad128078ce52807f0fcd8a8f0f80.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: iZ5tS-MP-5Tmh9chAvC-mHw4uXgsbzY1cXcQnUp6Y0k_1765362761 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ABA7EUMSILPOTMACVID2MNRZ5BIMI2FY X-Message-ID-Hash: ABA7EUMSILPOTMACVID2MNRZ5BIMI2FY X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363538291158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_saveimage.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index c5620c82c5..a2e760c462 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -427,15 +427,15 @@ qemuSaveImageDecompressionStop(virCommand *cmd, static int -qemuSaveImageCreateFd(virQEMUDriver *driver, - virDomainObj *vm, +qemuSaveImageCreateFd(virDomainObj *vm, const char *path, virFileWrapperFd **wrapperFd, bool sparse, bool *needUnlink, unsigned int flags) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); int ret =3D -1; VIR_AUTOCLOSE fd =3D -1; int directFlag =3D 0; @@ -458,7 +458,7 @@ qemuSaveImageCreateFd(virQEMUDriver *driver, if (fd < 0) return -1; - if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) = < 0) + if (qemuSecuritySetImageFDLabel(priv->driver->securityManager, vm->def= , fd) < 0) return -1; if (!sparse && !(*wrapperFd =3D virFileWrapperFdNew(&fd, path, wrapper= Flags))) @@ -492,7 +492,7 @@ qemuSaveImageCreate(virQEMUDriver *driver, bool sparse =3D data->header.format =3D=3D QEMU_SAVE_FORMAT_SPARSE; /* Obtain the file handle. */ - fd =3D qemuSaveImageCreateFd(driver, vm, path, &wrapperFd, sparse, &ne= edUnlink, flags); + fd =3D qemuSaveImageCreateFd(vm, path, &wrapperFd, sparse, &needUnlink= , flags); if (fd < 0) goto cleanup; --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363615; cv=none; d=zohomail.com; s=zohoarc; b=QJlcUsQOo9YijYmaV3pDAAPnUpx9GYA+LuxKKj9NRZN0pCnSnATrXLThhHXB+qtZ6a6oQhc2FFw9CsgBAeXOY/DCOPfYGbC5wOpFuBBKFOFd7QsHTAp7I4O76hm1GIp4K3Z0gyB2LMDH2wJHYM4BUzRgUTrJ58+pDcfeMWxNZVU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363615; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=4iH056fu4RjTcjyTPdewVpUubj3+pSfyYp78buPq6Is=; b=IdCJ3kGKWhqoi2E6eiSQpQ3Z8K93FN1Od2Ig7IWL2Cf/h3lpk6k6uDLsjFodjNnezFaxjiVz9DD7wWa808pKm1iEZNW+6Mc1OQoD6BY9tXtHWyt6Evdgs5bdEoa5rxjABFhnT5ashUpyfZ+I50ee1dAOZdhLpYfeGgKea18w3qA= 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 1765363615752749.6308669591297; Wed, 10 Dec 2025 02:46:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id EB7BB3FB96; Wed, 10 Dec 2025 05:46:52 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C8EFF41C70; Wed, 10 Dec 2025 05:40:33 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id B9EF841B41; Wed, 10 Dec 2025 05:32:45 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 20A7041B32 for ; Wed, 10 Dec 2025 05:32:45 -0500 (EST) Received: from mx-prod-mc-03.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-364-I1edpsElOFqzgEOzuGqz5g-1; Wed, 10 Dec 2025 05:32:43 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D1C5E1956060 for ; Wed, 10 Dec 2025 10:32:42 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 298CB30001A8 for ; Wed, 10 Dec 2025 10:32:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4iH056fu4RjTcjyTPdewVpUubj3+pSfyYp78buPq6Is=; b=XE0mdsgkcaCqf/uPw3jc8itMVIut0zXyAQFNgB7uOVysHhrbPRHozPyadyBIdutK5nHeDg AgrN4O1BuacGD6Ilnc6mrImak31DnmTQg5EkxM/vTG86ac2i9nOYvAzhvt/JYeb3qZVSOw aCttn9m0JyzX7ZSBtMeM0y0GgPaV3h8= X-MC-Unique: I1edpsElOFqzgEOzuGqz5g-1 X-Mimecast-MFC-AGG-ID: I1edpsElOFqzgEOzuGqz5g_1765362762 To: devel@lists.libvirt.org Subject: [PATCH 08/10] qemuSaveImageCreate: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:29 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: wdpi_HSMlrwyebhMFY0Lg3Pncw9MB2uaG_PVh4J8RFI_1765362762 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: NDGSTVAXSF22YLLVWXICAW3E37JRASI5 X-Message-ID-Hash: NDGSTVAXSF22YLLVWXICAW3E37JRASI5 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363616530158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_saveimage.c | 6 +++--- src/qemu/qemu_saveimage.h | 3 +-- src/qemu/qemu_snapshot.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index abe91b303f..3f154969b8 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2682,7 +2682,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, (flags & VIR_DOMAIN_SAVE= _BYPASS_CACHE)))) goto endjob; - ret =3D qemuSaveImageCreate(driver, vm, path, data, compressor, + ret =3D qemuSaveImageCreate(vm, path, data, compressor, saveParams, flags, VIR_ASYNC_JOB_SAVE); if (ret < 0) goto endjob; diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index a2e760c462..09217a9c9d 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -475,8 +475,7 @@ qemuSaveImageCreateFd(virDomainObj *vm, * the caller needs to make sure that the processors are stopped and do al= l other * actions besides saving memory */ int -qemuSaveImageCreate(virQEMUDriver *driver, - virDomainObj *vm, +qemuSaveImageCreate(virDomainObj *vm, const char *path, virQEMUSaveData *data, virCommand *compressor, @@ -484,7 +483,8 @@ qemuSaveImageCreate(virQEMUDriver *driver, unsigned int flags, virDomainAsyncJob asyncJob) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + qemuDomainObjPrivate *priv =3D vm->privateData; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(priv->dr= iver); bool needUnlink =3D false; int ret =3D -1; int fd =3D -1; diff --git a/src/qemu/qemu_saveimage.h b/src/qemu/qemu_saveimage.h index 1fd96751a2..b46cabffe5 100644 --- a/src/qemu/qemu_saveimage.h +++ b/src/qemu/qemu_saveimage.h @@ -119,8 +119,7 @@ qemuSaveImageDecompressionStop(virCommand *cmd, const char *path); int -qemuSaveImageCreate(virQEMUDriver *driver, - virDomainObj *vm, +qemuSaveImageCreate(virDomainObj *vm, const char *path, virQEMUSaveData *data, virCommand *compressor, diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 5ceaff3554..c8954fd805 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1756,7 +1756,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, if (!(snap_params =3D qemuMigrationParamsNew())) goto cleanup; - if (qemuSaveImageCreate(driver, vm, snapdef->memorysnapshotfile, + if (qemuSaveImageCreate(vm, snapdef->memorysnapshotfile, data, compressor, snap_params, 0, VIR_ASYNC_JOB_SNAPSHOT) < 0) goto cleanup; --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363686; cv=none; d=zohomail.com; s=zohoarc; b=B2sa5goOgHZ5EVv83QhG8C7vqbtpXt6ogfulcI4omDkzFD9s5IBKcyrCTCi3kgVhtAJGdhXgLmqOHXCBC7yIRgMFpU0AwQGTEpW1XLYl05oU4j0EtffnbKmP4b5HoqxrrWzSYweYaT49Zmz2L02dh15kuTseypE/UYS3gV/uTL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363686; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=ISm3syNoMY+HWa6NUED8Ci2n7Q8tGVYKHDgSneT3Cjc=; b=iDWarPDpHyZUiWHYhXee7cYpVZ6FJy6UptjgwYdkmzrjFW3Hg6wD9Hz/iDwYFSmWnaw+G/QjrOh6GcmOz8wYr5VFYcTLqZAClufgsr+P3Mj8P8c+mNf1Qkqhi5S2vKOL6ulIZcZJ5yEMX9w6P11c8o0O78osIJySDqRU57Pg5jc= 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 1765363686158631.7316732526265; Wed, 10 Dec 2025 02:48:06 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 27D3C3FB01; Wed, 10 Dec 2025 05:47:59 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 0E39643F0F; Wed, 10 Dec 2025 05:40:56 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 27A2741B32; Wed, 10 Dec 2025 05:32:47 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 8EF1F41B41 for ; Wed, 10 Dec 2025 05:32:46 -0500 (EST) Received: from mx-prod-mc-03.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-462-cFU-_59tOy-G3ys3P-TTrA-1; Wed, 10 Dec 2025 05:32:44 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1FB1A1956058 for ; Wed, 10 Dec 2025 10:32:44 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 4955930001B9 for ; Wed, 10 Dec 2025 10:32:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ISm3syNoMY+HWa6NUED8Ci2n7Q8tGVYKHDgSneT3Cjc=; b=f052QEAU4OzYrnyv9RvFP8VSW4lRw0Tf9RXxCm9uwbWv45ryrPcO/Y1op45ttwZ8LkArk+ xGvHdIJ1wkg8oWc0qjFo1WxQdTPITWhGz4jDmjBjZ6Ozl2DJk+g+vd4PX+1DcF6yWI+7i9 +4cjMR4wNYyPP+TQSv5BAwhu129YIKo= X-MC-Unique: cFU-_59tOy-G3ys3P-TTrA-1 X-Mimecast-MFC-AGG-ID: cFU-_59tOy-G3ys3P-TTrA_1765362764 To: devel@lists.libvirt.org Subject: [PATCH 09/10] qemu: snapshot: Check earlier if memory snapshot is possible Date: Wed, 10 Dec 2025 11:32:30 +0100 Message-ID: <7a62abc417b96a74533936041e29f17046ed8693.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QzS1987qN_oValOccF_J-oUFUAe8ZFdx0Xy6p66l24o_1765362764 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: H2OH66W6Q6UBO6UZTCOY66WNCIULY62J X-Message-ID-Hash: H2OH66W6Q6UBO6UZTCOY66WNCIULY62J X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363686748158500 Content-Type: text/plain; charset="utf-8" From: Nikolay Shirokovskiy Don't unnecessarily pause the VM if the snapshot can't be taken. Signed-off-by: Nikolay Shirokovskiy Signed-off-by: Peter Krempa --- src/qemu/qemu_snapshot.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index c8954fd805..b75e2b4233 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -1661,6 +1661,12 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driv= er, virQEMUSaveData *data =3D NULL; g_autoptr(GHashTable) blockNamedNodeData =3D NULL; + if (memory) { + /* When doing a snapshot with memory check if migration is possibl= e */ + if (!qemuMigrationSrcIsAllowed(vm, false, VIR_ASYNC_JOB_SNAPSHOT, = 0)) + return -1; + } + /* If quiesce was requested, then issue a freeze command, and a * counterpart thaw command when it is actually sent to agent. * The command will fail if the guest is paused or the guest agent @@ -1723,10 +1729,6 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driv= er, if (memory) { g_autoptr(qemuMigrationParams) snap_params =3D NULL; - /* check if migration is possible */ - if (!qemuMigrationSrcIsAllowed(vm, false, VIR_ASYNC_JOB_SNAPSHOT, = 0)) - goto cleanup; - qemuDomainJobSetStatsType(vm->job->current, QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP); --=20 2.52.0 From nobody Fri Dec 12 12:53:24 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=1765363776; cv=none; d=zohomail.com; s=zohoarc; b=imK+/yOVTwV43HTX087M41XJ76aMtKBoSLCZcZo8llolwkkg3yye0eMmdAAj/htR6eFzqrNBtVNUWVYn4cREiCodpbLSMYmDLTNs91rfREMMzxQydeigvlkx1tOc2J+HHmLouWZT2M0GQo0rgWp100JwTUgdjLnMQFcAB0S/GXE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363776; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=2kG8AXnw/4HUeBN/7lTIFJaofRSfWDXDTmbcK1Gfo00=; b=lgTscwkhLjVFjKWVWYD5tbCMoZe5XYi4ltaIeS05deK13Pmac/sPp9rNijJlhMp21/RVf/tZwVONoDKqeViKgKqD9H4p9FdtlBmQIfQjlIHvjwdqxknw7N4c03Rv60VVpkStrg6WT20kEcwje2THxkp3kO82OhHTP0881jW3+yY= 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 1765363776294116.23560010516235; Wed, 10 Dec 2025 02:49:36 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 0F7F441847; Wed, 10 Dec 2025 05:49:22 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id F3FD2440AA; Wed, 10 Dec 2025 05:41:48 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id C6D7841B41; Wed, 10 Dec 2025 05:32:47 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 42FDC41B32 for ; Wed, 10 Dec 2025 05:32:47 -0500 (EST) Received: from mx-prod-mc-03.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-678-csM8maNqONCWQ66QHwAiAQ-1; Wed, 10 Dec 2025 05:32:45 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 23A091956061 for ; Wed, 10 Dec 2025 10:32:45 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6B0D130001A5 for ; Wed, 10 Dec 2025 10:32:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362767; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2kG8AXnw/4HUeBN/7lTIFJaofRSfWDXDTmbcK1Gfo00=; b=fh1vYTSGbSncH7RiifmPRIpja42XucsUql9fnH2c80jevuKGfTynJKdvAzah09IEJgJM1R 5o1rcYh12GVsmoufhgIF6rFTGprzw6JqGPuy7P5RCR21jNB1PWT9vi2hoCE7loPef/C3Rx Zl3J2VOOL+Vm09LWbEqScYM3ChZnoig= X-MC-Unique: csM8maNqONCWQ66QHwAiAQ-1 X-Mimecast-MFC-AGG-ID: csM8maNqONCWQ66QHwAiAQ_1765362765 To: devel@lists.libvirt.org Subject: [PATCH 10/10] virQEMUSaveDataNew: Refactor cleanup Date: Wed, 10 Dec 2025 11:32:31 +0100 Message-ID: <61285664bb58491b77bf581fa125e988e179c0a5.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: CTKiTOBnAxtejdxnQU-nbHavJ_nw2fdKql6ENCLU-Fg_1765362765 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: ZUPVAMK3PY4HC77OPKKA7TKMRVCGYXYU X-Message-ID-Hash: ZUPVAMK3PY4HC77OPKKA7TKMRVCGYXYU X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: 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: 1765363777200158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Use autoptr cleanup for 'data' and get rid of 'cleanup:' label. Signed-off-by: Peter Krempa --- src/qemu/qemu_saveimage.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index 09217a9c9d..cdfa9be09d 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -82,7 +82,7 @@ virQEMUSaveDataNew(char *domXML, virQEMUSaveFormat format, virDomainXMLOption *xmlopt) { - virQEMUSaveData *data =3D NULL; + g_autoptr(virQEMUSaveData) data =3D NULL; virQEMUSaveHeader *header; data =3D g_new0(virQEMUSaveData, 1); @@ -90,7 +90,7 @@ virQEMUSaveDataNew(char *domXML, if (cookieObj && !(data->cookie =3D virSaveCookieFormat((virObject *) cookieObj, virDomainXMLOptionGetSaveCook= ie(xmlopt)))) - goto error; + return NULL; header =3D &data->header; memcpy(header->magic, QEMU_SAVE_PARTIAL, sizeof(header->magic)); @@ -99,11 +99,8 @@ virQEMUSaveDataNew(char *domXML, header->format =3D format; data->xml =3D domXML; - return data; - error: - virQEMUSaveDataFree(data); - return NULL; + return g_steal_pointer(&data); } --=20 2.52.0