From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323057; cv=none; d=zohomail.com; s=zohoarc; b=O5rbdeKfyjQTq10KNUQU6PdYTOeI2tI6GSc+Nd+kGMeAcIsfyNgRP1hKr4nRKxSmrjmYUsy8Xh9jzInQ1flrjfhS4NHQuT/7GYU34YXymUIYP4xHr1SH6jXJ/l/ZXbJXEpS2kvdgDRpKmKb1mI5DHw6K2vyeDMvyplFBzrPyPZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323057; 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=joGhFqbkXJIwGYcCfM9Cetjqc11U/NTsRZEO4M0z1Cg=; b=N59CNlgP1yKRLGUTtH+QkClwXZxrXzwadXZadxKTCh2hIRfq/jZ3Wib2//nHN6Gi/ayWikwgaUBYQ7cl9SqmcSQdpbHrOmjtAWUMCVSRgPqz6MjO3TsGjqh/6YdoIXQskGGDPO3yRrjmTUvsNroX++I53UcGtnLkyl4einTrESE= 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 1747323057534896.5316387771711; Thu, 15 May 2025 08:30:57 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 90A6D144D; Thu, 15 May 2025 11:30:56 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EBC4413ED; Thu, 15 May 2025 11:29:28 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 2A1E113CC; Thu, 15 May 2025 11:29:23 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 401D41284 for ; Thu, 15 May 2025 11:29:20 -0400 (EDT) Received: from mx-prod-mc-06.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-93-drqy0A2oPpySI2e-ig6wMw-1; Thu, 15 May 2025 11:29:16 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A51121800771 for ; Thu, 15 May 2025 15:29:13 +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 A1A6F1805B03; Thu, 15 May 2025 15:29:12 +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=1747322960; 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=+/1+/UBTWCi82wETvatVqRDQdOjwY8nG92S0AwMQpEk=; b=ZrliUqyIXvvoQFjo8yKoXrig7I5P3lKXSc60MQ53NgSafkq0qlg7jmNF2e6qYliLvgDJFV wvAPDVgoXUD4SwOs6pbL/rvVADGgch5VkQKLQUNe+dLm5A9tgLpuQ7DAAhPFWC0ih2m4eL z9assYaJRfOun8ytQVKm+2q+ZiBhjE4= X-MC-Unique: drqy0A2oPpySI2e-ig6wMw-1 X-Mimecast-MFC-AGG-ID: drqy0A2oPpySI2e-ig6wMw_1747322955 To: devel@lists.libvirt.org Subject: [PATCH 01/17] qemuProcessStartWithMemoryState: Don't setup qemu for incoming migration when reverting internal snapshot Date: Thu, 15 May 2025 17:28:46 +0200 Message-ID: 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: TzhVvUumxD2OxeZhcZ2TQs-6Cz0XrGFKVtTJpytzbG4_1747322955 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: CVWLKJ2EOVXUKKWOQOLWY73GGSGV3V3C X-Message-ID-Hash: CVWLKJ2EOVXUKKWOQOLWY73GGSGV3V3C 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: 1747323059756116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The memory/device state of the VM for an internal snapshot is restored by qemu itself via a QMP command and is taken from the qcow2 image, thus we don't actually do any form of incoming migration. Commit 5b324c0a739fe00 which refactored the setup of the incoming migration state didn't take the above into account and inadvertently caused that qemu is being started with '-incoming defer' also when libvirt would want to revert an internal snapshot. Now when qemu expects incoming migration it doesn't activate the block backends as that would cause locking problems and image inconsistency, but also doesn't allow the use of the images. Since the block backends are not activated qemu then thinks that they don't actually support internal snapshots and reports: error: operation failed: load of internal snapshot 'foo1' job failed: Dev= ice 'libvirt-1-format' is writable but does not support snapshots Due to the above bug it's not possible to revert to internal snapshots in libvirt-11.2 and libvirt-11.3. Fixes: 5b324c0a739fe00cbec209219db4488742492112 Resolves: https://issues.redhat.com/browse/RHEL-88747 Closes: https://gitlab.com/libvirt/libvirt/-/issues/771 Signed-off-by: Peter Krempa Reviewed-by: Jim Fehlig Reviewed-by: Michal Privoznik --- src/qemu/qemu_process.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1af91c5909..5f2203dd13 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8636,9 +8636,13 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, /* The fd passed to qemuProcessIncomingDefNew is used to create the mi= gration * URI, so it must be called after starting the decompression program. */ - incoming =3D qemuProcessIncomingDefNew(driver, vm, NULL, "stdio", fd, = path, data, migParams); - if (!incoming) - return -1; + if (!snapshot) { + /* Internal snapshots are reverted by a QMP command after qemu is = started, + * so we don't actually want to setup incoming migration. */ + if (!(incoming =3D qemuProcessIncomingDefNew(driver, vm, NULL, "st= dio", + fd, path, data, migPara= ms))) + return -1; + } /* No cookie means libvirt which saved the domain was too old to mess = up * the CPU definitions. --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323011; cv=none; d=zohomail.com; s=zohoarc; b=IT5vaP+ldLfw24BfVXkDbWJveVuZLnBf5ebizc1jKw/eDOo9rdVOOkQo49yIM/iE9dwG4kWqTEmHcwDrJ9zQRZLDY/V/huf3hacgQ/4pmqEidk82V+whNuBXZwsdhswmDZ8z4TCBPor0sPfKia4pjd9v9wNBo6BkVUUpoI3AeYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323011; 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=kH9yGmzHAOaLhRJ27PqkZnpVyZhTFLI5IStdi8hqtug=; b=KOksLIDkB5AFbayvjan9VvGuniB5gWyCuIpjU5UH6e2lp9SojDUmj/DN5ldSpSecYS7Bq/lW3rDf7nYB0ezWl2I1TTO3wLH9nyrWwS6YQeTrPtYUsAfhAIfMiAfLpWRBvjoqjUPwPKhHL6LPTKRpPm4NwLtlCKI0inW1bSskRkc= 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 1747323011701978.860043689289; Thu, 15 May 2025 08:30:11 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C0992136B; Thu, 15 May 2025 11:30:10 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id EE4A213C6; Thu, 15 May 2025 11:29:21 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 80D66B75; Thu, 15 May 2025 11:29:18 -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 C2416C99 for ; Thu, 15 May 2025 11:29:17 -0400 (EDT) Received: from mx-prod-mc-04.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-466-THzX2ROnMGOh9MYBQ1BF_g-1; Thu, 15 May 2025 11:29:16 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 388FC194510D for ; Thu, 15 May 2025 15:29:15 +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 2E2FC1800DB9; Thu, 15 May 2025 15:29:13 +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=1747322957; 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=yML1bfppBpXnEVPoCi5LKHHqIMpgYf2xebUaa9t66p0=; b=WnK1g5zGFAhyoL3irPGx1awvRiU0U3FZM3IWOugmP4hbLTPOJvHxBY8P0+zU0yh5koioiL xFW0JS+GMxtZVf/G6MaNNcMvrAztkBmzj/pwjyRNqGgtYo/q6A1q6NFH44V1RQVY/0R4ri vhwwqTyOH10JIXd+csgkwDMb+RYtN64= X-MC-Unique: THzX2ROnMGOh9MYBQ1BF_g-1 X-Mimecast-MFC-AGG-ID: THzX2ROnMGOh9MYBQ1BF_g_1747322955 To: devel@lists.libvirt.org Subject: [PATCH 02/17] NEWS: Mention fix for internal snapshot reversion regression Date: Thu, 15 May 2025 17:28:47 +0200 Message-ID: <148f1fa0a55496e2a93998df53e856f75257159d.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: wFuvrkweX9GqOsP0oFVGwW3IOeA8OLaaKslqSpVBbF4_1747322955 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: UQTQEDG2AE62OTE3EFCI5VMMSFBG4FIC X-Message-ID-Hash: UQTQEDG2AE62OTE3EFCI5VMMSFBG4FIC 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: 1747323013035116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Signed-off-by: Peter Krempa Reviewed-by: Jim Fehlig Reviewed-by: Michal Privoznik --- NEWS.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index ad8910da4c..6cf2a47d3d 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -21,6 +21,16 @@ v11.4.0 (unreleased) * **Bug fixes** + * qemu: Fix failure when reverting to internal snapshots + + Due to a regression in how libvirt starts qemu when reverting to a sna= pshot + it became impossible to revert to internal snapshots in ``libvirt-11.2= `` and + ``libvirt-11.3`` releases. Attempts to revert would produce the follow= ing + error:: + + error: operation failed: load of internal snapshot 'foo1' job failed= : Device 'libvirt-1-format' is writable but does not support snapshots + + There is no workaround for this except for avoiding the broken version= s. v11.3.0 (2025-05-02) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323034; cv=none; d=zohomail.com; s=zohoarc; b=PSWd+xx9A1Gtb3+wki+TrX8puN/kZrTVmggp3sXYibRC/JsQl3TYFCs/RWo2Bl3kJqkBXLe+w4GC6uU21vfbv+Rjn1Q66uVoeoEliLQyx0YoiU6/3YislrH6wXzhYWXstMgPRdvCvRHLnpwCT7Vyi8F0x+SszigQOQtUuwc9Xx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323034; 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=RLHrRB7q/owhQ/afx7lBUdILW9Bn5HuI23u7b27dg2s=; b=bU4n2YTa6D6Y0eU92ZyQZVTxhjgMN/ayT/3e6uQrNO5K4d3DjPfTHwce96kvKoLLEZrvzPvOdFYuTB3/kjeH5iyR0MQDV9NN8Q60y+ZvQdeAJ3rTx07+keM6YE5AhFeSyZoatZ8O62UJImfr7OYbtfDbIIlA/OgWVu1tN5Risfg= 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 1747323034515771.882070845359; Thu, 15 May 2025 08:30:34 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8D80E1490; Thu, 15 May 2025 11:30:33 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4625E13EC; Thu, 15 May 2025 11:29:27 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DBE60D3B; Thu, 15 May 2025 11:29:19 -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 67A2DB75 for ; Thu, 15 May 2025 11:29:19 -0400 (EDT) Received: from mx-prod-mc-06.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-56-gFHxcYnkPvC4BY6ZzjtC7w-1; Thu, 15 May 2025 11:29:17 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B833E1800261 for ; Thu, 15 May 2025 15:29:16 +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 B9238180045B; Thu, 15 May 2025 15:29:15 +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=1747322959; 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=a1c1mdWHTq9clpDY23WG56z4HDKhtP+VzPXZb/gfDfs=; b=ehgDs2y8EjHP//dm7ElgINVDMNcWHJZmpyF/zW7coNIXNGKVYpoheExXgref6HLa1orb9Q dLkw2tVglDAkYKxczhIILDDTjZvHgYHTsmdNH5FwS4+GLxdYsEfgLN77hMFUV8yQ/w8voC +6I60EYfzTj8Yotp8LUuZYCqPsSBE0Y= X-MC-Unique: gFHxcYnkPvC4BY6ZzjtC7w-1 X-Mimecast-MFC-AGG-ID: gFHxcYnkPvC4BY6ZzjtC7w_1747322957 To: devel@lists.libvirt.org Subject: [PATCH 03/17] qemuSnapshotRevertActive: Remove transient domain on failure Date: Thu, 15 May 2025 17:28:48 +0200 Message-ID: <4eb20e806098d39e7f57b9a83c392b07535a4de3.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: 4szd17zDdzyXgpkl_TkSIisKlYjFdyAnuZK8SWraGog_1747322957 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: PMZGE6DB76DI3NOBFUMZUUEV5JSVMEX6 X-Message-ID-Hash: PMZGE6DB76DI3NOBFUMZUUEV5JSVMEX6 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: 1747323035266116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Code paths which deal with stopping of the qemu process need extra handling for transient definitions as they need to be removed from the domain list when we'd be leaving them inactive. In case of snapshot code it's on failure to revert a snapshot as we stop the qemu process but the failure to revert may mean that the new process will not be started. I've observed this when I was fixing the recent bug in snapshot reversion which left the domain in unusable state after failure to revert: $ virsh list foo error: Requested operation is not valid: domain is not running $ virsh undefine foo error: Requested operation is not valid: cannot undefine transient domain Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_snapshot.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index f9b18f94b6..6926d1a0e4 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2628,13 +2628,12 @@ qemuSnapshotRevertActive(virDomainObj *vm, if (virDomainSnapshotIsExternal(snap)) { if (!(tmpsnapdef =3D virDomainSnapshotDefNew())) - return -1; + goto error; if (qemuSnapshotRevertExternalPrepare(vm, tmpsnapdef, snap, *config, *inactiveConfig, - &memdata) < 0) { - return -1; - } + &memdata) < 0) + goto error; } else { loadSnap =3D snap; } @@ -2656,7 +2655,7 @@ qemuSnapshotRevertActive(virDomainObj *vm, VIR_ASYNC_JOB_SNAPSHOT, VIR_QEMU_PROCESS_STOP_MIGRATED); } - return -1; + goto error; } detail =3D VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; @@ -2667,7 +2666,7 @@ qemuSnapshotRevertActive(virDomainObj *vm, if (virDomainSnapshotIsExternal(snap)) { if (qemuSnapshotRevertExternalActive(vm, tmpsnapdef) < 0) - return -1; + goto error; qemuSnapshotRevertExternalFinish(vm, tmpsnapdef, snap); } @@ -2689,16 +2688,22 @@ qemuSnapshotRevertActive(virDomainObj *vm, if (!virDomainObjIsActive(vm)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); - return -1; + goto error; } rc =3D qemuProcessStartCPUs(driver, vm, VIR_DOMAIN_RUNNING_FROM_SNAPSHOT, VIR_ASYNC_JOB_SNAPSHOT); if (rc < 0) - return -1; + goto error; } return qemuSnapshotRevertWriteMetadata(vm, snap, driver, cfg, defined); + + error: + if (!virDomainObjIsActive(vm)) + qemuDomainRemoveInactive(driver, vm, 0, false); + + return -1; } --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323090; cv=none; d=zohomail.com; s=zohoarc; b=kvVzKlX8C8rKHRtCDuKGryXTKfabNetpqHaD16xmRTr3LqgZ0zhK11wIaexjkhxND7NyAJoJHyZFdnAx2cSmYz5bSU6oADXP42ABJkEaYcYOZNL3AK5++Rv73xFjr2Dk7zpexCLnQo9YKdCnifjz0kze3un0VNCVq6jC6yJn80o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323090; 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=GMIW5bqslJgk7q+H9cHcCOZETlpn3U0+4IWJ2FN0xKg=; b=Wawx1eGFOAOUxN+yF7LsyyQDngkriWS5et0sXZfGhzhnwmunoq33lL6KeosPn23VLYriSwSV4yRWPKY9BOqZjXrgfQvZpnJx4XGWy2rolM5idGTyzur1e0caeC0bNnuUcwuDh8UMsNt/O3zoDgrfgjGJsgUEsLk7PFolUFpEsaU= 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 17473230902759.142075995054824; Thu, 15 May 2025 08:31:30 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 4298713E7; Thu, 15 May 2025 11:31:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 2F4D31373; Thu, 15 May 2025 11:29:33 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7CEE41402; Thu, 15 May 2025 11:29:28 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 C94D81339 for ; Thu, 15 May 2025 11:29:20 -0400 (EDT) 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-241-mGXyLEhBOnSvAWGTKAa1rw-1; Thu, 15 May 2025 11:29:19 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3AF5B180036E for ; Thu, 15 May 2025 15:29:18 +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 3BAB918003FC; Thu, 15 May 2025 15:29:17 +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=1747322960; 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=5rEfqKw1dX8fx621EIsk+fQGDLWppBY5pqZvW5CCxW8=; b=TGNYgfj9sbtYpCAi2nCeGoWhZxtZAFB0SS8n767hw15Yj+hC64hfSEOtI6Asbsa+Ix9Ld5 FJJCOHyJwh7RMzYPFjZ74B3VjqZ5SCrwqJPKQxnQGDbjCkKds/n8/PXPQriyzy+o2BmcUb I7vvWQ4H8NlilGJ3EpNpqcTvUJY1Nt4= X-MC-Unique: mGXyLEhBOnSvAWGTKAa1rw-1 X-Mimecast-MFC-AGG-ID: mGXyLEhBOnSvAWGTKAa1rw_1747322958 To: devel@lists.libvirt.org Subject: [PATCH 04/17] qemuSnapshotRevertInactive: Ensure all error paths handle transient domains properly Date: Thu, 15 May 2025 17:28:49 +0200 Message-ID: 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: koZX6gLC4JsfxDFVgyVSOqp74iiYdWfRGsGdCexN25U_1747322958 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WS346BE2HBFHXSVH7R4HIYBC5E4DHRA7 X-Message-ID-Hash: WS346BE2HBFHXSVH7R4HIYBC5E4DHRA7 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: 1747323092032116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Only the internal snapshot code paths were able to handle transient domains properly in case when startup of the process failed. Unify the error paths on an 'error' label with proper handling. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_snapshot.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index 6926d1a0e4..b66b83e230 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2773,24 +2773,20 @@ qemuSnapshotRevertInactive(virDomainObj *vm, if (virDomainSnapshotIsExternal(snap)) { if (!(tmpsnapdef =3D virDomainSnapshotDefNew())) - return -1; + goto error; if (qemuSnapshotRevertExternalPrepare(vm, tmpsnapdef, snap, - NULL, *inactiveConfig, NULL)= < 0) { - return -1; - } + NULL, *inactiveConfig, NULL)= < 0) + goto error; if (qemuSnapshotRevertExternalInactive(tmpsnapdef, - *inactiveConfig) < 0) { - return -1; - } + *inactiveConfig) < 0) + goto error; qemuSnapshotRevertExternalFinish(vm, tmpsnapdef, snap); } else { - if (qemuSnapshotInternalRevertInactive(vm, snap) < 0) { - qemuDomainRemoveInactive(driver, vm, 0, false); - return -1; - } + if (qemuSnapshotInternalRevertInactive(vm, snap) < 0) + goto error; } if (*inactiveConfig) { @@ -2810,10 +2806,9 @@ qemuSnapshotRevertInactive(virDomainObj *vm, NULL, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags); virDomainAuditStart(vm, "from-snapshot", rc >=3D 0); - if (rc < 0) { - qemuDomainRemoveInactive(driver, vm, 0, false); - return -1; - } + if (rc < 0) + goto error; + detail =3D VIR_DOMAIN_EVENT_STARTED_FROM_SNAPSHOT; event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STARTED, @@ -2829,6 +2824,12 @@ qemuSnapshotRevertInactive(virDomainObj *vm, } return qemuSnapshotRevertWriteMetadata(vm, snap, driver, cfg, defined); + + error: + if (!virDomainObjIsActive(vm)) + qemuDomainRemoveInactive(driver, vm, 0, false); + + return -1; } --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323110; cv=none; d=zohomail.com; s=zohoarc; b=YnyizH12BHi16B0sWTQLeUShh2ELvXcxchhd5fYINYdCWr2Zgcdeb0niwGgJ4W0eLgWvgQNsiMusTsjOYeI6T4FCTN3Gr6FNScCcDF1EXc9A2jEpgZb/VASRutoNkuNRWtqIwXCgiwW9qJCRBqcYoQDI3qIxWWvYNPq7I+4ltx4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323110; 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=Q5tdZjVrNk7oErlxfwuT8WGEi7w23GI5Dvek/etv50g=; b=CcXjxpmP3MoCwuFOSNtZBwSFGriLYwX0Fu3+GExffH0X1qnMtWdR87JTPKwhZEJiN0xOosnnj+2b5yeUV2ToNRgKrh2+NkdD95tKDfrQzSU3n8JATESEGN1WEgntbOC6xsMrlFxHwQ2DuOzOHcw/qKIto/JmKXyVSTdDbUpvo6M= 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 1747323110364648.8004150485739; Thu, 15 May 2025 08:31:50 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5C04E1411; Thu, 15 May 2025 11:31:49 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id D3C141326; Thu, 15 May 2025 11:29:42 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 23FE513F2; Thu, 15 May 2025 11:29:38 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 8FEBC11B8 for ; Thu, 15 May 2025 11:29:22 -0400 (EDT) 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-557-HSxWifpiMKmm45zEexb4HQ-1; Thu, 15 May 2025 11:29:20 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B4EB0195608E for ; Thu, 15 May 2025 15:29:19 +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 B3C6E18001D8; Thu, 15 May 2025 15:29:18 +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=1747322962; 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=n4BwjgJB39jRSVy0RGpvtnuwRb9raXp2zeSbNSCh75s=; b=PkjEZgMNgzz7mwaa79BOPcw/eR3HSBDjleTYYHs6rv+qg8bK4sGIrZ2NyCMe3ZR9qrtM6U DJ52g0kKpq9f0oiB5O5fdQ205P3faod5SMMqZqoPscSw2fIsU1waHVTE3TQoROkM4Tde+G EI0Y7GKZbI6yo7Nb2SlQgEk2LA2Oyrk= X-MC-Unique: HSxWifpiMKmm45zEexb4HQ-1 X-Mimecast-MFC-AGG-ID: HSxWifpiMKmm45zEexb4HQ_1747322959 To: devel@lists.libvirt.org Subject: [PATCH 05/17] qemuBuildCommandLine: Drop 'snapshot' argument Date: Thu, 15 May 2025 17:28:50 +0200 Message-ID: <8495423f77c787e33cc8d76d8e6d7e4bcf66c0f6.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: -KiptWveCRYTCYSKRpeLzJoYbhz4x6Pe3AwZV7PQ8CY_1747322959 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: YIOVS5X43IZCSMRPD3TMOGPUW4JUTIZS X-Message-ID-Hash: YIOVS5X43IZCSMRPD3TMOGPUW4JUTIZS 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: 1747323112213116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa After recent refactors that removed legacy way to revert snapshots we no longer need to know the snapshot state during commandline build. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_command.c | 5 ++--- src/qemu/qemu_command.h | 1 - src/qemu/qemu_process.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bf03561fde..1ee4aa4829 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10471,7 +10471,6 @@ qemuBuildCompatDeprecatedCommandLine(virCommand *cm= d, virCommand * qemuBuildCommandLine(virDomainObj *vm, const char *migrateURI, - virDomainMomentObj *snapshot, virNetDevVPortProfileOp vmop, size_t *nnicindexes, int **nicindexes) @@ -10485,8 +10484,8 @@ qemuBuildCommandLine(virDomainObj *vm, virDomainDef *def =3D vm->def; virQEMUCaps *qemuCaps =3D priv->qemuCaps; - VIR_DEBUG("Building qemu commandline for def=3D%s(%p) migrateURI=3D%s = snapshot=3D%p vmop=3D%d", - def->name, def, migrateURI, snapshot, vmop); + VIR_DEBUG("Building qemu commandline for def=3D%s(%p) migrateURI=3D%s = vmop=3D%d", + def->name, def, migrateURI, vmop); if (qemuBuildCommandLineValidate(driver, def) < 0) return NULL; diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index a386c34f20..2d43cf5506 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -43,7 +43,6 @@ VIR_ENUM_DECL(qemuSoundCodec); virCommand * qemuBuildCommandLine(virDomainObj *vm, const char *migrateURI, - virDomainMomentObj *snapshot, virNetDevVPortProfileOp vmop, size_t *nnicindexes, int **nicindexes); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5f2203dd13..46a33036b7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8046,7 +8046,7 @@ qemuProcessLaunch(virConnectPtr conn, if (!(cmd =3D qemuBuildCommandLine(vm, incoming ? "defer" : NULL, - snapshot, vmop, + vmop, &nnicindexes, &nicindexes))) goto cleanup; @@ -8712,7 +8712,6 @@ qemuProcessCreatePretendCmdBuild(virDomainObj *vm, { return qemuBuildCommandLine(vm, migrateURI, - NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, NULL, NULL); --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323132; cv=none; d=zohomail.com; s=zohoarc; b=P2zqP7LtYkvVG62pNrQLHn6OnjAVRWk4p3ZhqIG6+UJVEm6ZRL+uBaI3wOjbWxS7H0TYdfVgsaHq9M7jA3IMkoVLcwVV1y8kdpk2EDGXemu0VmQ3ww0xcz5yLCzhKrlginEdeQOz0/5e7KqkghCEX6AYzmg1qxStSY4oDJinDcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323132; 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=EKGpu6g2ecJVd5sF92AYvQKdeemgP+bwcCmb1gAFh3M=; b=VSVO7iJnBtMfOLeO/a4BBZR9sVuDDd4x2GhRI3sq92Vz2kFQwvJw9s3zn6ggWDyEB/MAe3bUJ3tsahNVUd5NsY4glCPZ3vO5iIX2Nl+HqMhkqkcxK0p/w8Xk4DVtYy91W0/jqLzIJOLJSkSObxETc2q2yvY1A2StFQwGtUUuwq0= 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 17473231323491.804703331631913; Thu, 15 May 2025 08:32:12 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6BA30135C; Thu, 15 May 2025 11:32:11 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 968B812BF; Thu, 15 May 2025 11:29:44 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C8F9E13A6; Thu, 15 May 2025 11:29:38 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 EEFE213D6 for ; Thu, 15 May 2025 11:29:23 -0400 (EDT) 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-655-yw9m5MsPOP2kzck5EW1qAA-1; Thu, 15 May 2025 11:29:22 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3FCAD1954B1D for ; Thu, 15 May 2025 15:29:21 +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 3BBDF18003FC; Thu, 15 May 2025 15:29:19 +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=1747322963; 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=MS1DU9QO7T/yZJLy3+Ww9txT1XLNz+Yy7VZvdv5aW6A=; b=ZZQNgHJrp1Wh2k3r8hW63lscoG1sCYPEBbIouC+yd8gGDkyPQsl7z8aM0JpeFSCvyrvWat 3luxZ7BRkuKe2onLNMA4UrmpvrZXoD1HS/I7CW6QdR0WYKSEDByhB6taeFuBnZ01I1BiJX X2hEEOhmVBfo4b2pmclKXc8h6NZniZU= X-MC-Unique: yw9m5MsPOP2kzck5EW1qAA-1 X-Mimecast-MFC-AGG-ID: yw9m5MsPOP2kzck5EW1qAA_1747322961 To: devel@lists.libvirt.org Subject: [PATCH 06/17] qemuProcessLaunch: Rename 'snapshot' to 'internalSnapshotRevert' Date: Thu, 15 May 2025 17:28:51 +0200 Message-ID: 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: asW7TClU1sH7Z9fZfiihkPfmnTc0DGozzanilnF2n6g_1747322961 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: FMY2AS7BNERNKUXRDA4XFXS3WKGN4ORA X-Message-ID-Hash: FMY2AS7BNERNKUXRDA4XFXS3WKGN4ORA 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: 1747323134644116600 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 Reviewed-by: Michal Privoznik --- src/qemu/qemu_process.c | 15 ++++++++------- src/qemu/qemu_process.h | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 46a33036b7..d86138aef4 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -7963,7 +7963,7 @@ qemuProcessLaunch(virConnectPtr conn, virDomainObj *vm, virDomainAsyncJob asyncJob, qemuProcessIncomingDef *incoming, - virDomainMomentObj *snapshot, + virDomainMomentObj *internalSnapshotRevert, virNetDevVPortProfileOp vmop, unsigned int flags) { @@ -7983,12 +7983,13 @@ qemuProcessLaunch(virConnectPtr conn, VIR_DEBUG("conn=3D%p driver=3D%p vm=3D%p name=3D%s id=3D%d asyncJob=3D= %d " "incoming.uri=3D%s " "incoming.fd=3D%d incoming.path=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, asyncJob, NULLSTR(incoming ? incoming->uri : NULL), incoming ? incoming->fd : -1, NULLSTR(incoming ? incoming->path : NULL), - snapshot, vmop, flags); + NULLSTR(internalSnapshotRevert ? internalSnapshotRevert->def= ->name : NULL), + vmop, flags); /* Okay, these are just internal flags, * but doesn't hurt to check */ @@ -8252,9 +8253,9 @@ qemuProcessLaunch(virConnectPtr conn, qemuDomainVcpuPersistOrder(vm->def); - if (snapshot) { + if (internalSnapshotRevert) { VIR_DEBUG("reverting internal snapshot via QMP"); - if (qemuSnapshotInternalRevert(vm, snapshot, asyncJob) < 0) + if (qemuSnapshotInternalRevert(vm, internalSnapshotRevert, asyncJo= b) < 0) goto cleanup; } @@ -8306,14 +8307,14 @@ qemuProcessLaunch(virConnectPtr conn, /* Since CPUs were not started yet, the balloon could not return the m= emory * to the host and thus cur_balloon needs to be updated so that GetXML= desc * and friends return the correct size in case they can't grab the job= */ - if (!incoming && !snapshot && + if (!incoming && !internalSnapshotRevert && qemuProcessRefreshBalloonState(vm, asyncJob) < 0) goto cleanup; if (flags & VIR_QEMU_PROCESS_START_AUTODESTROY) virCloseCallbacksDomainAdd(vm, conn, qemuProcessAutoDestroy); - if (!incoming && !snapshot) { + if (!incoming && !internalSnapshotRevert) { VIR_DEBUG("Setting up transient disk"); if (qemuProcessSetupDisksTransient(vm, asyncJob) < 0) goto cleanup; diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 1729b39d73..021dbbd960 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -153,7 +153,7 @@ int qemuProcessLaunch(virConnectPtr conn, virDomainObj *vm, virDomainAsyncJob asyncJob, qemuProcessIncomingDef *incoming, - virDomainMomentObj *snapshot, + virDomainMomentObj *internalSnapshotRevert, virNetDevVPortProfileOp vmop, unsigned int flags); --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=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 Reviewed-by: Michal Privoznik --- 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 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323154; cv=none; d=zohomail.com; s=zohoarc; b=SswxIQuOM7Y8CnwljRWdZrmvUD3dtABC7QP/ZpBcKhJXwYMvY2Fwxvlg8Ulj7qZ+jHs3IUgOvpQQ3Fls7mgyKsJLppgiCn4P9t+WCXQbyUf+obWKbYbwXvIiOmzzVcHoKBnL0KEOM3+UjX6D0wKNat/qhqWO6zP8FNP+uC3Sejs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323154; 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=2PjGi2VTuXg6qPO1gtI3Oq+xf1Oo/BSAfqoDWKdFhrg=; b=QE8zG8Ec4abuxVzgT4a8ZzRjdXaPRVa6R4nVykM4HkIKXpIaIyt+r72iGwh0RRm/CHrxew0GnZ2x8PykWuZnNgv5DlVIaDP08TVs4nDpPPVniRIhUbY7CGxoov43h9rDdgfhwEKQGNfoJFMQ8s/kFLyahGMmpjH1tBkavJORq0s= 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 1747323154468576.4154529010376; Thu, 15 May 2025 08:32:34 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7EB4F150B; Thu, 15 May 2025 11:32:33 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id A7D461428; Thu, 15 May 2025 11:29:47 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 33CB81366; Thu, 15 May 2025 11:29:40 -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 81D3D1301 for ; Thu, 15 May 2025 11:29:26 -0400 (EDT) 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-416-iYH7zEUPPcqGYFnpfhBFEQ-1; Thu, 15 May 2025 11:29:25 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3D4B3195608B for ; Thu, 15 May 2025 15:29:24 +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 3D003180045B; Thu, 15 May 2025 15:29:23 +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=1747322966; 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=sGECi6RHgUNK36IzGIEWVeIQZDDZFmz8EF0cp3G1pes=; b=RDGaSGPh9wH1L40eJ96sQWek7+TorbzewZVI+AKQQao4x2cdOKwhW1q+2n0eY+7T7+H26v 0TH1e3E0AkfuJaKwKhTYWfrZgad8US7NNQvirypfdiW70EymMF99xdAKlQ1NUmi/3M/8E7 RuS8zmQhUidZ1XpVcTqAUZo6dc582MU= X-MC-Unique: iYH7zEUPPcqGYFnpfhBFEQ-1 X-Mimecast-MFC-AGG-ID: iYH7zEUPPcqGYFnpfhBFEQ_1747322964 To: devel@lists.libvirt.org Subject: [PATCH 08/17] qemuProcessStartWithMemoryState: Rename 'snapshot' to 'internalSnapshotRevert' Date: Thu, 15 May 2025 17:28:53 +0200 Message-ID: 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: uHz37HVJn263syocMisOz6lRHLOC1x7tWC-PpXT33Ho_1747322964 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: HQOQ43QO5HAZONQ6F364VJWSSKOZNQRP X-Message-ID-Hash: HQOQ43QO5HAZONQ6F364VJWSSKOZNQRP 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: 1747323156645116600 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. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_process.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f5543542d5..bed517184f 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8580,7 +8580,7 @@ qemuProcessStart(virConnectPtr conn, * @vm: domain object * @fd: FD pointer of memory state file * @path: path to memory state file - * @snapshot: internal snapshot to load when starting QEMU process or NULL + * @internalSnapshotRevert: internal snapshot to load when starting QEMU p= rocess or NULL * @data: data from memory state file or NULL * @migParams: Migration params to use on restore or NULL * @asyncJob: type of asynchronous job @@ -8591,11 +8591,11 @@ qemuProcessStart(virConnectPtr conn, * Start VM with existing memory state. Make sure that the stored memory s= tate * is correctly decompressed so it can be loaded by QEMU process. * - * When reverting to internal snapshot caller needs to pass @snapshot + * When reverting to internal snapshot caller needs to pass @internalSnaps= hotRevert * to correctly start QEMU process, @fd, @path, @data needs to be NULL. * * When restoring VM from saved image caller needs to pass @fd, @path and - * @data to correctly start QEMU process, @snapshot needs to be NULL. + * @data to correctly start QEMU process, @internalSnapshotRevert needs to= be NULL. * * For audit purposes the expected @reason is one of `restored` or `from-s= napshot`. * @@ -8607,7 +8607,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, virDomainObj *vm, int *fd, const char *path, - virDomainMomentObj *snapshot, + virDomainMomentObj *internalSnapshotRevert, virQEMUSaveData *data, qemuMigrationParams *migParams, virDomainAsyncJob asyncJob, @@ -8638,7 +8638,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, /* The fd passed to qemuProcessIncomingDefNew is used to create the mi= gration * URI, so it must be called after starting the decompression program. */ - if (!snapshot) { + if (!internalSnapshotRevert) { /* Internal snapshots are reverted by a QMP command after qemu is = started, * so we don't actually want to setup incoming migration. */ if (!(incoming =3D qemuProcessIncomingDefNew(driver, vm, NULL, "st= dio", @@ -8656,7 +8656,7 @@ qemuProcessStartWithMemoryState(virConnectPtr conn, priv->disableSlirp =3D true; if (qemuProcessStart(conn, driver, vm, cookie ? cookie->cpu : NULL, - asyncJob, incoming, *fd, path, snapshot, + asyncJob, incoming, *fd, path, internalSnapshotRe= vert, migParams, VIR_NETDEV_VPORT_PROFILE_OP_RESTORE, start_flags) =3D=3D 0) *started =3D true; --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323219; cv=none; d=zohomail.com; s=zohoarc; b=lwdRGWcSMuhg5UkITQIuIDXhhKsi4fgbg+VRjkKAZzaLQ6Fn9nHl/ENxUqL+R9cxSEhX1q4BJi/MgGvi1Sl+l1axeD/uiIbHsG2VhPiuMs/zeZt6995qjam94imqoQsCiG/6CjCsluhZqpNJM4XFFj1rize3fYNTIttJDWjgpuE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323219; 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=u9KkLcCNR3Etq1DHWDD9FfU+ghL4GGZ2mBX9B2Q15is=; b=JYc5EnKhKVkb+If7gJXZXRjcEpTliRVginLE9bDVjtmHHv6vNAytQHKal6dA7iIJW1eOCPp5gZFbrafss6Z0/eyCZIXhz5Lapb2pc6CHHVbWRG44icUdxLvKKWzKkc+ALBEOkt5byePuD7oaHKYVixxGPnaRbMcCkL62pAJwzYU= 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 1747323219974751.8039998629929; Thu, 15 May 2025 08:33:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EDD8D1490; Thu, 15 May 2025 11:33:38 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C831C1276; Thu, 15 May 2025 11:29:51 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 520B01345; Thu, 15 May 2025 11:29:42 -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 29A751345 for ; Thu, 15 May 2025 11:29:28 -0400 (EDT) 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-6-zpBtXqYlMHSWvkKj_neGbg-1; Thu, 15 May 2025 11:29:26 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B3A25180056F for ; Thu, 15 May 2025 15:29:25 +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 B435F18003FC; Thu, 15 May 2025 15:29:24 +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=eXzDBKOUF9NPDZp8sQSRiwYjn1d2inuu7AN9UcVtX/Y=; b=CkmI3dVHDGAJ44svxqEWtAlMReYOcwwin6wIQbwEZY4Y3DBULnjTxwEwVLHSvXRrmVtRzA ZRS1+y7i3JaUKYC9KC/TXI0SYs6MryhVljgU+9rsiVanuYuUvceWa+X8QZkxFebAANSUll x/l6KIeoC5E3sB+sKiUDC++pUgMY5DI= X-MC-Unique: zpBtXqYlMHSWvkKj_neGbg-1 X-Mimecast-MFC-AGG-ID: zpBtXqYlMHSWvkKj_neGbg_1747322965 To: devel@lists.libvirt.org Subject: [PATCH 09/17] qemuExtDevicesCleanupHost: Use 'virQEMUDriverConfig' instead of 'virQEMUDriver' Date: Thu, 15 May 2025 17:28:54 +0200 Message-ID: <7e1b5c04e2aaef8f07143fb1a7d927aa68f6745a.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: kJXNZVMzAQ_zrKcmy1F-0AEZK88vovI6XPzuMmz6esw_1747322965 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 3TAHHMGNIXN6WJLACBVM5JEJ4FDMSZV5 X-Message-ID-Hash: 3TAHHMGNIXN6WJLACBVM5JEJ4FDMSZV5 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: 1747323221373116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Refactor the function and all callees to use the driver config instead. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_extdevice.c | 18 ++++++++++-------- src/qemu/qemu_extdevice.h | 4 ++-- src/qemu/qemu_process.c | 2 +- src/qemu/qemu_tpm.c | 14 +++++--------- src/qemu/qemu_tpm.h | 4 ++-- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 5603feaa05..235bfd65cb 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5816,7 +5816,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver, if (rmdir(chkDir) < 0 && errno !=3D ENOENT) VIR_WARN("unable to remove checkpoint directory %s", chkDir); } - qemuExtDevicesCleanupHost(driver, vm->def, flags, migration); + qemuExtDevicesCleanupHost(cfg, vm->def, flags, migration); } diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c index 31c7a14156..8df93a77ce 100644 --- a/src/qemu/qemu_extdevice.c +++ b/src/qemu/qemu_extdevice.c @@ -58,7 +58,7 @@ qemuExtDeviceLogCommand(virQEMUDriver *driver, /* * qemuExtDevicesInitPaths: * - * @driver: QEMU driver + * @cfg: QEMU driver config * @def: domain definition * * Initialize paths of external devices so that it is known where state is @@ -66,7 +66,7 @@ qemuExtDeviceLogCommand(virQEMUDriver *driver, * changes. */ int -qemuExtDevicesInitPaths(virQEMUDriver *driver, +qemuExtDevicesInitPaths(virQEMUDriverConfig *cfg, virDomainDef *def) { size_t i; @@ -75,7 +75,7 @@ qemuExtDevicesInitPaths(virQEMUDriver *driver, virDomainTPMDef *tpm =3D def->tpms[i]; if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR && - qemuExtTPMInitPaths(driver, def, tpm) < 0) + qemuExtTPMInitPaths(cfg, def, tpm) < 0) return -1; } @@ -95,10 +95,11 @@ int qemuExtDevicesPrepareDomain(virQEMUDriver *driver, virDomainObj *vm) { + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); int ret =3D 0; size_t i; - if (qemuExtDevicesInitPaths(driver, vm->def) < 0) + if (qemuExtDevicesInitPaths(cfg, vm->def) < 0) return -1; for (i =3D 0; i < vm->def->nvideos; i++) { @@ -151,21 +152,21 @@ qemuExtDevicesPrepareHost(virQEMUDriver *driver, void -qemuExtDevicesCleanupHost(virQEMUDriver *driver, +qemuExtDevicesCleanupHost(virQEMUDriverConfig *cfg, virDomainDef *def, virDomainUndefineFlagsValues flags, bool migration) { size_t i; - if (qemuExtDevicesInitPaths(driver, def) < 0) + if (qemuExtDevicesInitPaths(cfg, def) < 0) return; for (i =3D 0; i < def->ntpms; i++) { virDomainTPMDef *tpm =3D def->tpms[i]; if (tpm->type =3D=3D VIR_DOMAIN_TPM_TYPE_EMULATOR) - qemuExtTPMCleanupHost(driver, tpm, flags, migration); + qemuExtTPMCleanupHost(cfg, tpm, flags, migration); } } @@ -282,10 +283,11 @@ qemuExtDevicesStop(virQEMUDriver *driver, virDomainObj *vm, bool migration) { + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); virDomainDef *def =3D vm->def; size_t i; - if (qemuExtDevicesInitPaths(driver, def) < 0) + if (qemuExtDevicesInitPaths(cfg, def) < 0) return; for (i =3D 0; i < def->nvideos; i++) { diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index 36f7fb77a8..a8ed2aa7e4 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -31,7 +31,7 @@ int qemuExtDeviceLogCommand(virQEMUDriver *driver, G_GNUC_WARN_UNUSED_RESULT; int -qemuExtDevicesInitPaths(virQEMUDriver *driver, +qemuExtDevicesInitPaths(virQEMUDriverConfig *cfg, virDomainDef *def) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; @@ -45,7 +45,7 @@ int qemuExtDevicesPrepareHost(virQEMUDriver *driver, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; -void qemuExtDevicesCleanupHost(virQEMUDriver *driver, +void qemuExtDevicesCleanupHost(virQEMUDriverConfig *cfg, virDomainDef *def, virDomainUndefineFlagsValues flags, bool migration) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index bed517184f..5636d4fb76 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9577,7 +9577,7 @@ qemuProcessReconnect(void *opaque) if (qemuDomainMasterKeyReadFile(priv) < 0) goto error; - if (qemuExtDevicesInitPaths(driver, obj->def) < 0) + if (qemuExtDevicesInitPaths(cfg, obj->def) < 0) goto error; /* If we are connecting to a guest started by old libvirt there is no diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c index 0d3be3971a..b2f76e6b8b 100644 --- a/src/qemu/qemu_tpm.c +++ b/src/qemu/qemu_tpm.c @@ -926,7 +926,7 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm, /** * qemuTPMEmulatorCleanupHost: - * @driver: QEMU driver + * @cfg: QEMU driver config * @tpm: TPM definition * @flags: flags indicating whether to keep or remove TPM persistent state * @migration: whether cleanup is due to a successful outgoing or failed @@ -935,13 +935,11 @@ qemuTPMEmulatorInitPaths(virDomainTPMDef *tpm, * Clean up persistent storage for the swtpm. */ static void -qemuTPMEmulatorCleanupHost(virQEMUDriver *driver, +qemuTPMEmulatorCleanupHost(virQEMUDriverConfig *cfg, virDomainTPMDef *tpm, virDomainUndefineFlagsValues flags, bool migration) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - /* Never remove the state in case of migration with shared storage. */ if (migration && virFileIsSharedFS(tpm->data.emulator.source_path, cfg->sharedFiles= ystems) =3D=3D 1) @@ -1275,12 +1273,10 @@ qemuTPMCanMigrateSharedStorage(virDomainDef *def) int -qemuExtTPMInitPaths(virQEMUDriver *driver, +qemuExtTPMInitPaths(virQEMUDriverConfig *cfg, virDomainDef *def, virDomainTPMDef *tpm) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); - return qemuTPMEmulatorInitPaths(tpm, cfg->swtpmStorageDir, cfg->swtpmLogDir, @@ -1311,12 +1307,12 @@ qemuExtTPMPrepareHost(virQEMUDriver *driver, void -qemuExtTPMCleanupHost(virQEMUDriver *driver, +qemuExtTPMCleanupHost(virQEMUDriverConfig *cfg, virDomainTPMDef *tpm, virDomainUndefineFlagsValues flags, bool migration) { - qemuTPMEmulatorCleanupHost(driver, tpm, flags, migration); + qemuTPMEmulatorCleanupHost(cfg, tpm, flags, migration); } diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h index 37813087cf..f0f16392a1 100644 --- a/src/qemu/qemu_tpm.h +++ b/src/qemu/qemu_tpm.h @@ -22,7 +22,7 @@ #include "vircommand.h" -int qemuExtTPMInitPaths(virQEMUDriver *driver, +int qemuExtTPMInitPaths(virQEMUDriverConfig *cfg, virDomainDef *def, virDomainTPMDef *tpm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) @@ -35,7 +35,7 @@ int qemuExtTPMPrepareHost(virQEMUDriver *driver, ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; -void qemuExtTPMCleanupHost(virQEMUDriver *driver, +void qemuExtTPMCleanupHost(virQEMUDriverConfig *cfg, virDomainTPMDef *tpm, virDomainUndefineFlagsValues flags, bool migration) --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323245; cv=none; d=zohomail.com; s=zohoarc; b=JX+oVbwbaDDwtePkVG/rcP+cGBUecnwcYAHv22W7PxBqNf1nJUdy/Bgaq1H5XJJt5PfcpCJBBuFJTbhHvw4gGeB2Xqmp1q9N+kM7C/NY3gyskgFg4L6blAknekfGr4D5umKld/Ki9fGY6jhP2h12XRYPHopIRbr7XtRPUj1Tyoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323245; 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=xxUgPhmfI4Nz9e2Dk2pxzlTLh/wcO+8x/iRyOe2SRoQ=; b=FG+ozRtDjeYn/n+Jvigg58P70WDLu4lfEAVSRIMUSnCe9OPAa5iROhiPUi83ZqrBI+ryRgJ+Q82HRcgQLlEFmY75QvMRUDZAsZTxEWUFShRX1Zv+XRxy3fhXAqKBBhbP1xPdf91LcyyjM5mvczwnj5EsYGY7c/vQh7nUhEhd1BQ= 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 1747323245698329.104365325349; Thu, 15 May 2025 08:34:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BF622150C; Thu, 15 May 2025 11:34:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 7197E147C; Thu, 15 May 2025 11:29:53 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id F1B651419; Thu, 15 May 2025 11:29:49 -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 BAED41361 for ; Thu, 15 May 2025 11:29:29 -0400 (EDT) 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-248--L66kSUTPY--DBHCrDVe0w-1; Thu, 15 May 2025 11:29:28 -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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 36A95180045C for ; Thu, 15 May 2025 15:29:27 +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 3784C18003FC; Thu, 15 May 2025 15:29:25 +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=1747322969; 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=VqdnZfrh30J4/HjV7ykXf2259dCn4HGaQ4FFWGMrGvE=; b=bkvwHQkgJ5cR9ZmkAGFIixu5KqwqLs7Jfu7Plh3IudbVHRUMt5aWDIN6ljFDLO2lu9+Rwg 9wV2qZVfr3sqO6u2oYnmCsPuhPua+kPD3ShgTBpU/FF26t4kcFhf4sNENPOlKrm3T3PYmc 9ql8+thUY4XAi2ocD4rABAcHzzp+74c= X-MC-Unique: -L66kSUTPY--DBHCrDVe0w-1 X-Mimecast-MFC-AGG-ID: -L66kSUTPY--DBHCrDVe0w_1747322967 To: devel@lists.libvirt.org Subject: [PATCH 10/17] qemuCheckpointDiscardAllMetadata: Remove 'driver' argument Date: Thu, 15 May 2025 17:28:55 +0200 Message-ID: <9ac8ec23ed0dd374a91fb45fdf47af0240002edd.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: 97S1nVmkayuJ6dUDFyHws-xYEEo8FaCAUaMTcK9Cy7U_1747322967 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: N7PMPKQHO477H562LOOHLMXD4FPG5E6A X-Message-ID-Hash: N7PMPKQHO477H562LOOHLMXD4FPG5E6A 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: 1747323247623116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The function can extract it from @vm. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_checkpoint.c | 5 ++--- src/qemu/qemu_checkpoint.h | 3 +-- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index cf44e45aa1..af847cf1f2 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -305,11 +305,10 @@ qemuCheckpointDiscard(virQEMUDriver *driver, int -qemuCheckpointDiscardAllMetadata(virQEMUDriver *driver, - virDomainObj *vm) +qemuCheckpointDiscardAllMetadata(virDomainObj *vm) { virQEMUMomentRemove rem =3D { - .driver =3D driver, + .driver =3D QEMU_DOMAIN_PRIVATE(vm)->driver, .vm =3D vm, .metadata_only =3D true, .momentDiscard =3D qemuCheckpointDiscard, diff --git a/src/qemu/qemu_checkpoint.h b/src/qemu/qemu_checkpoint.h index fc1c35cdd2..2c72213598 100644 --- a/src/qemu/qemu_checkpoint.h +++ b/src/qemu/qemu_checkpoint.h @@ -33,8 +33,7 @@ qemuCheckpointObjFromName(virDomainObj *vm, const char *name); int -qemuCheckpointDiscardAllMetadata(virQEMUDriver *driver, - virDomainObj *vm); +qemuCheckpointDiscardAllMetadata(virDomainObj *vm); virDomainCheckpointPtr qemuCheckpointCreateXML(virDomainPtr domain, diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 235bfd65cb..fe969ca3d3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5807,7 +5807,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver, VIR_WARN("unable to remove snapshot directory %s", snapDir); } /* Remove any checkpoint metadata prior to removing the domain */ - if (qemuCheckpointDiscardAllMetadata(driver, vm) < 0) { + if (qemuCheckpointDiscardAllMetadata(vm) < 0) { VIR_WARN("unable to remove all checkpoints for domain %s", vm->def->name); } else { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index a34d6f1437..546545dd01 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6599,7 +6599,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, ncheckpoints); goto endjob; } - if (qemuCheckpointDiscardAllMetadata(driver, vm) < 0) + if (qemuCheckpointDiscardAllMetadata(vm) < 0) goto endjob; } --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323272; cv=none; d=zohomail.com; s=zohoarc; b=DzGTa4MPQrZHbb0YxlEa6rFKIK9RpfHwwY602T3l705q6YwjhCWaHzU8EhBFDu62MciH/BoQUkAwSUmFle9ppXOIC8PN+IqfBfIplTHypW8vG16rXLX20/sBGM5UQSfoKGBP5SyPVoK9QeEFBL+urCR8OuKKh6vGaX9iSefuTcg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323272; 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=W6Y4rblUOYZ3Te2pP9FfOYdLU1J53H88jrdUMHik7zc=; b=PnmWZCLm9AHIq1m3853dWZ8Wfq6Uu1jbkmyTp4S/LoIYES6AGlEaB9A26g8MyE/Zjv4GY9z9H3Gi96TWvV2V9oMw2hIaF+qw/HG+kYAnGAsD7yoASImwgVSGq9LDItxbcDAQlWlbMYqNaqgn8FcGK2qYpn2Uw+02F3MMSI8EX2U= 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 1747323272137169.96305301199686; Thu, 15 May 2025 08:34:32 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 1ED42151F; Thu, 15 May 2025 11:34:29 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 3B22F12C7; Thu, 15 May 2025 11:29:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8293C1474; Thu, 15 May 2025 11:29:50 -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 ECCDC1371 for ; Thu, 15 May 2025 11:29:30 -0400 (EDT) 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-66-vTYSBEj7N92hnRCelOPvuQ-1; Thu, 15 May 2025 11:29:29 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B2D671956086 for ; Thu, 15 May 2025 15:29:28 +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 AE75018003FC; Thu, 15 May 2025 15:29:27 +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=1747322970; 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=wuBKPzYnC4/Nref1N87cC492kOqS9w68M+UCBnrKNsc=; b=arlHUu6GjusAzGT/VK0VGasZiwsD4HZHZwS2ue5G5D4CxEy48mtzfoYCdksW4Gx+2i2cXW Kv+Kq18xr2fD7gUv0Pchf7DXtTRl/h6DVNhcY+qrFHdP9W0Brox5Hrz3vZdb3Q0XnhzZzZ J0Ahnihg6G7Sq7prkY5/aXo3NlZS8W4= X-MC-Unique: vTYSBEj7N92hnRCelOPvuQ-1 X-Mimecast-MFC-AGG-ID: vTYSBEj7N92hnRCelOPvuQ_1747322968 To: devel@lists.libvirt.org Subject: [PATCH 11/17] qemuSnapshotDiscardAllMetadata: Remove 'driver' argument Date: Thu, 15 May 2025 17:28:56 +0200 Message-ID: <9625b6dca4bbc8ef4db3d55aa1ea7fe799002ede.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: DRETceUvTi85v1Bf6d_MBzIrcFcH8TxV_jgxJFkXJK0_1747322968 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: OM4YMPVMV6J4GQKHT5KYAYCJT5XDZSXJ X-Message-ID-Hash: OM4YMPVMV6J4GQKHT5KYAYCJT5XDZSXJ 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: 1747323273810116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The function can extract it from @vm. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_snapshot.c | 5 ++--- src/qemu/qemu_snapshot.h | 3 +-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fe969ca3d3..fa1615ceba 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5797,7 +5797,7 @@ qemuDomainRemoveInactiveCommon(virQEMUDriver *driver, g_autofree char *chkDir =3D NULL; /* Remove any snapshot metadata prior to removing the domain */ - if (qemuSnapshotDiscardAllMetadata(driver, vm) < 0) { + if (qemuSnapshotDiscardAllMetadata(vm) < 0) { VIR_WARN("unable to remove all snapshots for domain %s", vm->def->name); } else { diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 546545dd01..6d43c2415c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6587,7 +6587,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, nsnapshots); goto endjob; } - if (qemuSnapshotDiscardAllMetadata(driver, vm) < 0) + if (qemuSnapshotDiscardAllMetadata(vm) < 0) goto endjob; } if (!virDomainObjIsActive(vm) && diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index b66b83e230..db5ba1eece 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -4135,11 +4135,10 @@ qemuSnapshotDiscard(virQEMUDriver *driver G_GNUC_UN= USED, int -qemuSnapshotDiscardAllMetadata(virQEMUDriver *driver, - virDomainObj *vm) +qemuSnapshotDiscardAllMetadata(virDomainObj *vm) { virQEMUMomentRemove rem =3D { - .driver =3D driver, + .driver =3D QEMU_DOMAIN_PRIVATE(vm)->driver, .vm =3D vm, .metadata_only =3D true, .momentDiscard =3D qemuSnapshotDiscard, diff --git a/src/qemu/qemu_snapshot.h b/src/qemu/qemu_snapshot.h index f38c2acfb3..2e5c3b5423 100644 --- a/src/qemu/qemu_snapshot.h +++ b/src/qemu/qemu_snapshot.h @@ -50,8 +50,7 @@ qemuSnapshotRevert(virDomainObj *vm, unsigned int flags); int -qemuSnapshotDiscardAllMetadata(virQEMUDriver *driver, - virDomainObj *vm); +qemuSnapshotDiscardAllMetadata(virDomainObj *vm); int qemuSnapshotDelete(virDomainObj *vm, --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323292; cv=none; d=zohomail.com; s=zohoarc; b=BqIS6Dw4Q2fVaHIx60fT6lbI+x4xfFdnyoFmMfVYqNtv6fc4kgnvu3ISQtVkBxw9gOILkEegq/W5dARqIxZNwFdj7lt46OG6o0wf1hWeLnqQPZj07LWPTFvZdkLAG419ZysbXkCwrEXBdB9Xn59QYyIOYMzKhS5IKKsJI9uaVGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323292; 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=A6TPf1jzvojqYAkdK5FN6yoqWrhSJqJTEjyD99wLUXY=; b=fdrp/StzCVfEg3g3r/KgmmSBmb5PUh/dofnyoyphblbZXgbHtfAxB113mhcZCtlNWT8dl9w1QpaI+TXeCbs/4MuQlzH3rBJk0UDv6HZ3xmYmzrM3TcvCrHGv+L9bMBidN9WTTWsGfwHQEBbrTbuN0cYNqghb6oomGhPOhG2wcak= 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 1747323292201760.4386991685014; Thu, 15 May 2025 08:34:52 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 35A4B14F5; Thu, 15 May 2025 11:34:51 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 0800B144E; Thu, 15 May 2025 11:29:58 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id B9FA6132E; Thu, 15 May 2025 11:29:50 -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 7BC3D142F for ; Thu, 15 May 2025 11:29:32 -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-340-f2kawBs6MQKgb4yOZsf6fQ-1; Thu, 15 May 2025 11:29:31 -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 36D90195608B for ; Thu, 15 May 2025 15:29:30 +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 322DA18001D8; Thu, 15 May 2025 15:29:28 +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=1747322972; 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=WIMS9pVmo7ZGLRnMTdlTHduJN1WXZOYSYf16Yrg5nyg=; b=cJtdAohNJ4P82gANvq6cjbN/6MptBiKm7gRP+4XQWO5EqrmBuvUe8aO5tU6RYxXxtyi769 BlCg/7TvdNHnSby94ZpwuUH2jjb8FU9/xxckNKBHMlR3aKZ8WUM+aTReKJVEKobfh9z8IF WEzD6Rc4KboK7VfBW4QOlYq8XZ9x4nQ= X-MC-Unique: f2kawBs6MQKgb4yOZsf6fQ-1 X-Mimecast-MFC-AGG-ID: f2kawBs6MQKgb4yOZsf6fQ_1747322970 To: devel@lists.libvirt.org Subject: [PATCH 12/17] qemuDomainRemoveInactiveCommon: Remove 'driver' argument Date: Thu, 15 May 2025 17:28:57 +0200 Message-ID: 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: f9-Vs2WrliME7CgUf9sjH9m5hvMfKi39Ipe2_lNbd5c_1747322970 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: VWUIGNWF7WG2CXSB5XTT4E7DXCLNRG72 X-Message-ID-Hash: VWUIGNWF7WG2CXSB5XTT4E7DXCLNRG72 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: 1747323294141116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The function can fetch it from @vm. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index fa1615ceba..8ad7a57a85 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5787,12 +5787,11 @@ int qemuDomainMomentDiscardAll(void *payload, static void -qemuDomainRemoveInactiveCommon(virQEMUDriver *driver, - virDomainObj *vm, +qemuDomainRemoveInactiveCommon(virDomainObj *vm, virDomainUndefineFlagsValues flags, bool migration) { - g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(QEMU_DOM= AIN_PRIVATE(vm)->driver); g_autofree char *snapDir =3D NULL; g_autofree char *chkDir =3D NULL; @@ -5836,7 +5835,7 @@ qemuDomainRemoveInactive(virQEMUDriver *driver, return; } - qemuDomainRemoveInactiveCommon(driver, vm, flags, migration); + qemuDomainRemoveInactiveCommon(vm, flags, migration); virDomainObjListRemove(driver->domains, vm); } @@ -5858,7 +5857,7 @@ qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, return; } - qemuDomainRemoveInactiveCommon(driver, vm, 0, false); + qemuDomainRemoveInactiveCommon(vm, 0, false); virDomainObjListRemoveLocked(driver->domains, vm); } --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323352; cv=none; d=zohomail.com; s=zohoarc; b=TVkcZHsk7iA89V0YBNxSqp63RLuWFqLvy8vHvcENMBrNyp6dN6mBHAVd0Eknf0U0R1vYob4Gl2yrpBVeCJSrqjLfaW8KN+MbATXOoLwxmKnOUJ7jbx2ycsMrKXhH5Dmfz+tObp9lP/GHkL7/jyhJyYD4e+v4TMTyljKRpdabNyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323352; 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=MTdV1LH5ISpKkLFgvEw3VZJ4iCB6AVF4TKws8W1erUU=; b=kiNodlGV/Ml3/mkH57lqNkeM67CMzDdyjHY+6qQcp7TVZU50HxvH3BlIuu9k8Yi+yoZXWZMvvVtrPeRTv7FVtB7oZM5gSW6IuB/BszEe0r8HjAExCcmDXKj9jiCubO6F73LwMxGwarShHD8Cc7g/1GCV5hpOMDnT7BU5gdXyNwg= 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 1747323352183995.730892023812; Thu, 15 May 2025 08:35:52 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 3C3B9E68; Thu, 15 May 2025 11:35:51 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 4073614AC; Thu, 15 May 2025 11:30:03 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id DD96D147B; Thu, 15 May 2025 11:29:51 -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 0AA591448 for ; Thu, 15 May 2025 11:29:35 -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-494-UOZ2qsEpMe6YFJxsoyIQCQ-1; Thu, 15 May 2025 11:29:32 -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 ADFE4195608B for ; Thu, 15 May 2025 15:29:31 +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 AB7E7180045B; Thu, 15 May 2025 15:29:30 +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=1747322974; 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=AaJuxpmiOdVqYoqj0Rww3b1r/hu0RG4SU+zznHS8cic=; b=PuF0sw20pWOSfTxmFllSDhbBFfcMOV2XXSJHtepB0QMkL86yhH7kXf1agaRK3Ys5CB//uC hrKJ0sGmsxDJL+nSFh4Va7HTFqNFkwDa/WmfqjgYYfiJo9h1xeJ/4H6tUlkYG3AjMwcFGh VgfunV4kiX3veB0yhPJDrXGdjQZdrBE= X-MC-Unique: UOZ2qsEpMe6YFJxsoyIQCQ-1 X-Mimecast-MFC-AGG-ID: UOZ2qsEpMe6YFJxsoyIQCQ_1747322971 To: devel@lists.libvirt.org Subject: [PATCH 13/17] qemuProcessStop: Drop 'driver' argument Date: Thu, 15 May 2025 17:28:58 +0200 Message-ID: <4b2bf1bcb5ef5d2de14b5928e9aeeb80fca215e8.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: xGZKB0sGNmL7BosUuWCCMwQlwr3wVbF9byCv14JOwEU_1747322971 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: GEAJKXMXZSBHOLM6IILBCPLVGOAD3ISB X-Message-ID-Hash: GEAJKXMXZSBHOLM6IILBCPLVGOAD3ISB 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: 1747323353408116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa For now it's extracted as a temporary variable but in long term it ought to be eliminated. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 22 ++++++++-------------- src/qemu/qemu_migration.c | 8 ++++---- src/qemu/qemu_process.c | 21 +++++++++++---------- src/qemu/qemu_process.h | 3 +-- src/qemu/qemu_saveimage.c | 2 +- src/qemu/qemu_snapshot.c | 18 ++++++------------ 6 files changed, 31 insertions(+), 43 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6d43c2415c..50a5cdd594 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2057,8 +2057,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, if (vm->job->asyncJob =3D=3D VIR_ASYNC_JOB_MIGRATION_IN) stopFlags |=3D VIR_QEMU_PROCESS_STOP_MIGRATED; - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_DESTROYED, - VIR_ASYNC_JOB_NONE, stopFlags); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_DESTROYED, VIR_ASYNC_JOB_NONE, = stopFlags); if ((flags & VIR_DOMAIN_DESTROY_REMOVE_LOGS) && qemuDomainRemoveLogs(driver, vm->def->name) < 0) @@ -2681,8 +2680,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, goto endjob; /* Shut it down */ - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SAVED, - VIR_ASYNC_JOB_SAVE, 0); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_SAVED, VIR_ASYNC_JOB_SAVE, 0); virDomainAuditStop(vm, "saved"); event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPP= ED, VIR_DOMAIN_EVENT_STOPPED_SAV= ED); @@ -3212,8 +3210,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, endjob: if ((ret =3D=3D 0) && (flags & VIR_DUMP_CRASH)) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, - VIR_ASYNC_JOB_DUMP, 0); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_CRASHED, VIR_ASYNC_JOB_DUMP= , 0); virDomainAuditStop(vm, "crashed"); event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, @@ -3535,8 +3532,7 @@ processGuestPanicEvent(virQEMUDriver *driver, G_GNUC_FALLTHROUGH; case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY: - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED, - VIR_ASYNC_JOB_DUMP, 0); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_CRASHED, VIR_ASYNC_JOB_DUMP= , 0); event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED= _CRASHED); @@ -3890,7 +3886,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_STOPP= ED, eventReason); - qemuProcessStop(driver, vm, stopReason, VIR_ASYNC_JOB_NONE, stopFlags); + qemuProcessStop(vm, stopReason, VIR_ASYNC_JOB_NONE, stopFlags); virDomainAuditStop(vm, auditReason); virObjectEventStateQueue(driver->domainEventState, event); @@ -4050,15 +4046,13 @@ processNbdkitExitedEvent(virDomainObj *vm, static void -processShutdownCompletedEvent(virQEMUDriver *driver, - virDomainObj *vm) +processShutdownCompletedEvent(virDomainObj *vm) { if (qemuProcessBeginStopJob(vm, VIR_JOB_DESTROY, true) < 0) return; if (virDomainObjIsActive(vm)) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_UNKNOWN, - VIR_ASYNC_JOB_NONE, 0); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_UNKNOWN, VIR_ASYNC_JOB_NONE= , 0); } qemuProcessEndStopJob(vm); @@ -4129,7 +4123,7 @@ static void qemuProcessEventHandler(void *data, void = *opaque) processNbdkitExitedEvent(vm, processEvent->data); break; case QEMU_PROCESS_EVENT_SHUTDOWN_COMPLETED: - processShutdownCompletedEvent(driver, vm); + processShutdownCompletedEvent(vm); break; case QEMU_PROCESS_EVENT_LAST: break; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index bb4d74a65d..f38733f904 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3438,7 +3438,7 @@ qemuMigrationDstPrepareActive(virQEMUDriver *driver, if (!relabel) stopFlags |=3D VIR_QEMU_PROCESS_STOP_NO_RELABEL; virDomainAuditStart(vm, "migrated", false); - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED, VIR_ASYNC_JOB_MIGRATION_IN, stopFlags); virPortAllocatorRelease(priv->nbdPort); priv->nbdPort =3D 0; @@ -4082,7 +4082,7 @@ qemuMigrationSrcComplete(virQEMUDriver *driver, * up domain shutdown until SPICE server transfers its data */ qemuMigrationSrcWaitForSpice(vm); - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED, asyncJob, + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_MIGRATED, asyncJob, VIR_QEMU_PROCESS_STOP_MIGRATED); virDomainAuditStop(vm, "migrated"); @@ -6301,7 +6301,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, * confirm step. */ if (!v3proto) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_MIGRATED, + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_MIGRATED, VIR_ASYNC_JOB_MIGRATION_OUT, VIR_QEMU_PROCESS_STOP_MIGRATED); virDomainAuditStop(vm, "migrated"); @@ -6954,7 +6954,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, if (qemuDomainObjIsActive(vm)) { if (doKill) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED, VIR_ASYNC_JOB_MIGRATION_IN, VIR_QEMU_PROCESS_STOP_MIGRATED); virDomainAuditStop(vm, "failed"); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 5636d4fb76..1432ec28d7 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -5961,7 +5961,7 @@ qemuProcessInit(virQEMUDriver *driver, stopFlags =3D VIR_QEMU_PROCESS_STOP_NO_RELABEL; if (migration) stopFlags |=3D VIR_QEMU_PROCESS_STOP_MIGRATED; - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopF= lags); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopFlags); return -1; } @@ -8568,7 +8568,7 @@ qemuProcessStart(virConnectPtr conn, stopFlags |=3D VIR_QEMU_PROCESS_STOP_MIGRATED; if (priv->mon) qemuMonitorSetDomainLog(priv->mon, NULL, NULL, NULL); - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopF= lags); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, stopFlags); goto cleanup; } @@ -8917,15 +8917,16 @@ qemuProcessEndStopJob(virDomainObj *vm) } -void qemuProcessStop(virQEMUDriver *driver, - virDomainObj *vm, - virDomainShutoffReason reason, - virDomainAsyncJob asyncJob, - unsigned int flags) +void +qemuProcessStop(virDomainObj *vm, + virDomainShutoffReason reason, + virDomainAsyncJob asyncJob, + unsigned int flags) { int ret; int retries =3D 0; qemuDomainObjPrivate *priv =3D vm->privateData; + virQEMUDriver *driver =3D priv->driver; virErrorPtr orig_err; virDomainDef *def =3D vm->def; size_t i; @@ -9264,7 +9265,7 @@ qemuProcessAutoDestroy(virDomainObj *dom, if (qemuProcessBeginStopJob(dom, VIR_JOB_DESTROY, true) < 0) return; - qemuProcessStop(driver, dom, VIR_DOMAIN_SHUTOFF_DESTROYED, + qemuProcessStop(dom, VIR_DOMAIN_SHUTOFF_DESTROYED, VIR_ASYNC_JOB_NONE, stopFlags); virDomainAuditStop(dom, "destroyed"); @@ -9828,7 +9829,7 @@ qemuProcessReconnect(void *opaque) * thread didn't have a chance to start playing with the domain yet * (it's all we can do anyway). */ - qemuProcessStop(driver, obj, state, VIR_ASYNC_JOB_NONE, stopFlags); + qemuProcessStop(obj, state, VIR_ASYNC_JOB_NONE, stopFlags); } goto cleanup; } @@ -9868,7 +9869,7 @@ qemuProcessReconnectHelper(virDomainObj *obj, * is no thread that could be doing anything else with the same do= main * object. */ - qemuProcessStop(src->driver, obj, VIR_DOMAIN_SHUTOFF_FAILED, + qemuProcessStop(obj, VIR_DOMAIN_SHUTOFF_FAILED, VIR_ASYNC_JOB_NONE, 0); qemuDomainRemoveInactiveLocked(src->driver, obj); diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 6d5f189aa4..b8c4af4aaf 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -176,8 +176,7 @@ int qemuProcessBeginStopJob(virDomainObj *vm, virDomainJob job, bool forceKill); void qemuProcessEndStopJob(virDomainObj *vm); -void qemuProcessStop(virQEMUDriver *driver, - virDomainObj *vm, +void qemuProcessStop(virDomainObj *vm, virDomainShutoffReason reason, virDomainAsyncJob asyncJob, unsigned int flags); diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index a6a5fb486e..702df641a0 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -773,7 +773,7 @@ qemuSaveImageStartVM(virConnectPtr conn, cleanup: if (ret < 0 && started) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED, asyncJob, VIR_QEMU_PROCESS_STOP_MIGRATED); } return ret; diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index db5ba1eece..a17b976381 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -595,7 +595,7 @@ qemuSnapshotCreateActiveInternal(virQEMUDriver *driver, if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) { event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_S= TOPPED, VIR_DOMAIN_EVENT_STOPPED_FROM_SNA= PSHOT); - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, VIR_ASYNC_JOB_SNAPSHOT, 0); virDomainAuditStop(vm, "from-snapshot"); resume =3D false; @@ -1694,8 +1694,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *drive= r, if (flags & VIR_DOMAIN_SNAPSHOT_CREATE_HALT) { event =3D virDomainEventLifecycleNewFromObj(vm, VIR_DOMAIN_EVENT_S= TOPPED, VIR_DOMAIN_EVENT_STOPPED_FROM_SNA= PSHOT); - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, - VIR_ASYNC_JOB_SNAPSHOT, 0); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, VIR_ASYNC_JO= B_SNAPSHOT, 0); virDomainAuditStop(vm, "from-snapshot"); resume =3D false; thaw =3D false; @@ -2615,9 +2614,7 @@ qemuSnapshotRevertActive(virDomainObj *vm, /* Transitions 2, 3, 5, 6, 8, 9 */ if (virDomainObjIsActive(vm)) { /* Transitions 5, 6, 8, 9 */ - qemuProcessStop(driver, vm, - VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, - VIR_ASYNC_JOB_SNAPSHOT, 0); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, VIR_ASYNC_JO= B_SNAPSHOT, 0); virDomainAuditStop(vm, "from-snapshot"); detail =3D VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT; event =3D virDomainEventLifecycleNewFromObj(vm, @@ -2651,7 +2648,7 @@ qemuSnapshotRevertActive(virDomainObj *vm, start_flags, "from-snapshot", &started) < 0) { if (started) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FAILED, + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FAILED, VIR_ASYNC_JOB_SNAPSHOT, VIR_QEMU_PROCESS_STOP_MIGRATED); } @@ -2761,8 +2758,7 @@ qemuSnapshotRevertInactive(virDomainObj *vm, if (virDomainObjIsActive(vm)) { /* Transitions 4, 7 */ - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, - VIR_ASYNC_JOB_SNAPSHOT, 0); + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_FROM_SNAPSHOT, VIR_ASYNC_JO= B_SNAPSHOT, 0); virDomainAuditStop(vm, "from-snapshot"); detail =3D VIR_DOMAIN_EVENT_STOPPED_FROM_SNAPSHOT; event =3D virDomainEventLifecycleNewFromObj(vm, @@ -4356,8 +4352,6 @@ qemuSnapshotDelete(virDomainObj *vm, virDomainMomentObj *snap =3D NULL; bool metadata_only =3D !!(flags & VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_= ONLY); bool stop_qemu =3D false; - qemuDomainObjPrivate *priv =3D vm->privateData; - virQEMUDriver *driver =3D priv->driver; g_autoslist(qemuSnapshotDeleteExternalData) externalData =3D NULL; virCheckFlags(VIR_DOMAIN_SNAPSHOT_DELETE_CHILDREN | @@ -4393,7 +4387,7 @@ qemuSnapshotDelete(virDomainObj *vm, endjob: if (stop_qemu) { - qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, + qemuProcessStop(vm, VIR_DOMAIN_SHUTOFF_SHUTDOWN, VIR_ASYNC_JOB_SNAPSHOT, 0); } --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323317; cv=none; d=zohomail.com; s=zohoarc; b=dB+3Saw9xrU8fuWhJFkkxoTU5zm6fRlpoxXSMY+AOJiAovfhm/QzUFSaHWrhtQc4ayKb6CJS9RIX7zEIgpVizPDOp4bttdmeTTYJMrNe/aPWMnqbIghmlajCQWAAek9m2onAxSsr9viAref4xiNhyZOpxCTTrUQPJwVZkUrjqPQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323317; 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=16QaSpSsmpxKfCwFjvX2WtPbyNLlvS4NY6y/vSE5meM=; b=dz+RInQ7Uxw/T5pDjQixHqe+afywlkHim2Fiak38qdWgiao2XOAx5mHOzqTaHGGQbyaFBbZJnsafG58pvPcMBtBRW2Eyk/Ewzyo1pYyOA+yYZD1T7lZywYGU2GK5khN7PsZW3w4ERarESgax51UyVkbfO52XzxaVpPZvj8nYg9o= 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 1747323317096424.64562755895247; Thu, 15 May 2025 08:35:17 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 193FE14AF; Thu, 15 May 2025 11:35:16 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 364BF146F; Thu, 15 May 2025 11:30:01 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 360261478; Thu, 15 May 2025 11:29:51 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 DFF5112F8 for ; Thu, 15 May 2025 11:29:35 -0400 (EDT) Received: from mx-prod-mc-06.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-179-9tVTliHIO6udP7qKB28oWw-1; Thu, 15 May 2025 11:29:34 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 32DB2180035F for ; Thu, 15 May 2025 15:29:33 +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 2D0C218003FC; Thu, 15 May 2025 15:29:31 +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=1747322975; 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=UXTjgdDjTN+3ACc3M3xrdX2hpAE7GrzC/2XXMA3OwZY=; b=V8n19h83/AVV1FoJl7K0rMDoMfP3zhT9nPkAWjWqQGAnBXa1yfOjmJgg/jYfGsnZCIDazS RcImEnLedp/OdT3aowl4DYpnNCRSaJl0BRdwhd5rA+apfzaWXVTrYgcdZhh3mfAF+3FIRO /ZyeHryXq2Omom/btmUZ8XTl2aMWLAI= X-MC-Unique: 9tVTliHIO6udP7qKB28oWw-1 X-Mimecast-MFC-AGG-ID: 9tVTliHIO6udP7qKB28oWw_1747322973 To: devel@lists.libvirt.org Subject: [PATCH 14/17] qemuDomainRemoveInactiveLocked: Remove 'driver' argument Date: Thu, 15 May 2025 17:28:59 +0200 Message-ID: <450837ed0badc2d5d37c0c103b41850ad8c340b3.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: wkAaKG68HgYtVXa293ZZLOj-WE9YnRGb1-HewwR9jLw_1747322973 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: IUF52BCEZZPC45WXFQS5APTMGZCLCVQS X-Message-ID-Hash: IUF52BCEZZPC45WXFQS5APTMGZCLCVQS 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: 1747323318267116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The function can extract the value from @vm's private data. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 5 ++--- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_process.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 8ad7a57a85..90258e9603 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5849,8 +5849,7 @@ qemuDomainRemoveInactive(virQEMUDriver *driver, * from locked list method. */ void -qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, - virDomainObj *vm) +qemuDomainRemoveInactiveLocked(virDomainObj *vm) { if (vm->persistent) { /* Short-circuit, we don't want to remove a persistent domain */ @@ -5859,7 +5858,7 @@ qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, qemuDomainRemoveInactiveCommon(vm, 0, false); - virDomainObjListRemoveLocked(driver->domains, vm); + virDomainObjListRemoveLocked(QEMU_DOMAIN_PRIVATE(vm)->driver->domains,= vm); } void diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8c1993ec64..56683848aa 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -697,8 +697,7 @@ void qemuDomainRemoveInactive(virQEMUDriver *driver, bool migration); void -qemuDomainRemoveInactiveLocked(virQEMUDriver *driver, - virDomainObj *vm); +qemuDomainRemoveInactiveLocked(virDomainObj *vm); void qemuDomainSetFakeReboot(virDomainObj *vm, bool value); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 1432ec28d7..50c7b47256 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9871,7 +9871,7 @@ qemuProcessReconnectHelper(virDomainObj *obj, */ qemuProcessStop(obj, VIR_DOMAIN_SHUTOFF_FAILED, VIR_ASYNC_JOB_NONE, 0); - qemuDomainRemoveInactiveLocked(src->driver, obj); + qemuDomainRemoveInactiveLocked(obj); virDomainObjEndAPI(&obj); g_clear_object(&data->identity); --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323391; cv=none; d=zohomail.com; s=zohoarc; b=UatN7uwxSSYtXATqKpHkE+AmFx/IXPejQolemINNJtxvaI19tKAEHtqs6ETEtxbKmo7w4scPmAD8xDagbzLodXHtSKdBMJomp2G/lztul55gd1N8gfS9bwZ/0vH/W6BlNUlcWrUucKUtI9N8mAq6lX8x9iY5R6TVVN/5mtLrjSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323391; 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=MbPIIRe93r/WtCt2YFu2H0H2R6633JXQo0UOujwffI8=; b=Z8ZPbyF6AngUa5UVZ64pCUcEiWumlasa8hJbmp2Xi7p02zDthkLq76CW4+RfuPk+fImQigh7N0j8iHZlUjoo5gujXf0mpwM4QLEzPQmkZTaQYf2WynL+hYoHzpdXpCdBgWdMONbUzEg01OqyZZQR0blVbDmCXihu+ojkuogDMCY= 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 1747323391711758.6349228109875; Thu, 15 May 2025 08:36:31 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id BBD78A45; Thu, 15 May 2025 11:36:30 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id F04D4146C; Thu, 15 May 2025 11:30:07 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 6D8E3147F; Thu, 15 May 2025 11:29:53 -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 5773C1394 for ; Thu, 15 May 2025 11:29:39 -0400 (EDT) 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-564-GrA6QMgsN065cEp9o87TSA-1; Thu, 15 May 2025 11:29:35 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id AC9C819560B4 for ; Thu, 15 May 2025 15:29:34 +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 A7189180045B; Thu, 15 May 2025 15:29:33 +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=1747322979; 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=2DdHou1bzGfd7mBeAZjooS8q4qi9MphPSwfYS8zuBhs=; b=OmrObd50bMg4NWcAc4L+FUI4Be5jQW1FHLHeXa/wT+poZZGWVcYdZOaQEnpXjfRwvAf993 Jr2O013HaTYl0iFB78Q8Pi5v37gKEIgLOLk+LLep7D3i0NEBNx61fNRX3nTLFlmo3URs+x p/OcT8FcyPsudUBrM1PrNIHWSwOOT9g= X-MC-Unique: GrA6QMgsN065cEp9o87TSA-1 X-Mimecast-MFC-AGG-ID: GrA6QMgsN065cEp9o87TSA_1747322974 To: devel@lists.libvirt.org Subject: [PATCH 15/17] qemuProcessReconnect: Modernize local variable setup Date: Thu, 15 May 2025 17:29:00 +0200 Message-ID: <2650c854c8c62cb79fd96b9c611084985ade7753.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: QnTu4bcMlsYwgif1XXAOst-781oyAglM6a1inGg5KNY_1747322974 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EK23WTX2DGXTR6MWPAIYXRY5MJ6GPWYH X-Message-ID-Hash: EK23WTX2DGXTR6MWPAIYXRY5MJ6GPWYH 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: 1747323394228116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Assign local variables directly and use autofree for temproary ones. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_process.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 50c7b47256..3bad805d3d 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9537,16 +9537,16 @@ struct qemuProcessReconnectData { static void qemuProcessReconnect(void *opaque) { - struct qemuProcessReconnectData *data =3D opaque; - virQEMUDriver *driver =3D data->driver; + g_autofree struct qemuProcessReconnectData *data =3D opaque; virDomainObj *obj =3D data->obj; - qemuDomainObjPrivate *priv; + qemuDomainObjPrivate *priv =3D obj->privateData; + virQEMUDriver *driver =3D priv->driver; + g_autoptr(virQEMUDriverConfig) cfg =3D virQEMUDriverGetConfig(driver); g_auto(virDomainJobObj) oldjob =3D { .cb =3D NULL, }; int state; int reason; - g_autoptr(virQEMUDriverConfig) cfg =3D NULL; size_t i; unsigned int stopFlags =3D 0; bool jobStarted =3D false; @@ -9554,10 +9554,6 @@ qemuProcessReconnect(void *opaque) virIdentitySetCurrent(data->identity); g_clear_object(&data->identity); - VIR_FREE(data); - - cfg =3D virQEMUDriverGetConfig(driver); - priv =3D obj->privateData; virDomainObjPreserveJob(obj->job, &oldjob); if (oldjob.asyncJob =3D=3D VIR_ASYNC_JOB_MIGRATION_IN) --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323373; cv=none; d=zohomail.com; s=zohoarc; b=ITr0ZObkEAKsZYQskU7bPETn6G4TZhB9pF353VA2d41lVIDJHwzGg2FcbzTq4VY3K6XXKsgKBBvEaiMDl0UYzHe1kBvEPcyW+6K/TBU7Xk+hGMk9VFcr8po+9Tve34c3bhJzSDRrUSaWyRAGffdQ1MnQJJFNAArgW/7f1Kp+kao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323373; 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=dgsMUQFNcggT3RR2LVW42VS0KekvfQUX5sAFcKqEwI4=; b=OfxmfM98C1Xo6qy/LeWdmB17EplGHd8KB9iYtrveGcgOsfz23PDSxoSbOvLZIHW6jIF8rdXA2Ux4RD/1EbfYCEdQvKSKfQjsGn+DdvuMfgh4wyzo3bZTAQCcTARRFo50SWGVCZ+OJPymYKW0YCs3Ar40q+3mgcEHhvY4iL01+bw= 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 1747323373502282.6117646538887; Thu, 15 May 2025 08:36:13 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 8DCDF148B; Thu, 15 May 2025 11:36:12 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 1B1D212F8; Thu, 15 May 2025 11:30:06 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C9D731366; Thu, 15 May 2025 11:29:52 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 9D6FE1459 for ; Thu, 15 May 2025 11:29:38 -0400 (EDT) Received: from mx-prod-mc-06.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-417-4quxMmlrOea4v8WZ16jYeA-1; Thu, 15 May 2025 11:29:36 -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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 30FD71800256 for ; Thu, 15 May 2025 15:29:36 +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 2C5C4180045B; Thu, 15 May 2025 15:29:34 +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=1747322978; 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=weU/oueXCzy974h6kUbNWEHZH5xBxyON9/jzkohYykc=; b=d4b0saPUNcxVvUSzQBBfLGiJjV0jdCU+OEbVrNOEmideOg4M1YAICYyXIsLfD+0JkMwIPR +ZEmJkZNcl1I1tbuYMEd4qW1kO0Xz0md5YOw3j8mWIBi/xrtYIADwqTzItanJhHFFIsi4g snOxmFEeMA9aN/B1oEGdcC0+WuLazNU= X-MC-Unique: 4quxMmlrOea4v8WZ16jYeA-1 X-Mimecast-MFC-AGG-ID: 4quxMmlrOea4v8WZ16jYeA_1747322976 To: devel@lists.libvirt.org Subject: [PATCH 16/17] qemuProcessReconnectData: Drop 'driver' struct and clean up Date: Thu, 15 May 2025 17:29:01 +0200 Message-ID: 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: v-qClvZTGw0GqaCPw6ReXBcflFFG9ZwvwoLTNCCupzM_1747322976 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: BFZDY6KMG73ZXRORY2VU3EP6MFTYFB6H X-Message-ID-Hash: BFZDY6KMG73ZXRORY2VU3EP6MFTYFB6H 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: 1747323375681116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Nobody reads the struct member any more. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_process.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 3bad805d3d..9d53768fed 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9512,7 +9512,6 @@ qemuProcessReloadMachineTypes(virDomainObj *vm) struct qemuProcessReconnectData { - virQEMUDriver *driver; virDomainObj *obj; virIdentity *identity; }; @@ -9832,10 +9831,9 @@ qemuProcessReconnect(void *opaque) static int qemuProcessReconnectHelper(virDomainObj *obj, - void *opaque) + void *opaque G_GNUC_UNUSED) { virThread thread; - struct qemuProcessReconnectData *src =3D opaque; struct qemuProcessReconnectData *data; g_autofree char *name =3D NULL; @@ -9845,7 +9843,6 @@ qemuProcessReconnectHelper(virDomainObj *obj, data =3D g_new0(struct qemuProcessReconnectData, 1); - memcpy(data, src, sizeof(*data)); data->obj =3D obj; data->identity =3D virIdentityGetCurrent(); @@ -9887,9 +9884,8 @@ qemuProcessReconnectHelper(virDomainObj *obj, void qemuProcessReconnectAll(virQEMUDriver *driver) { - struct qemuProcessReconnectData data =3D {.driver =3D driver}; virDomainObjListForEach(driver->domains, true, - qemuProcessReconnectHelper, &data); + qemuProcessReconnectHelper, NULL); } --=20 2.49.0 From nobody Mon Sep 8 21:40:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1747323425; cv=none; d=zohomail.com; s=zohoarc; b=bAKlm/W6uWl/BtDEzdCIFrX9gRSK6rX0gRvZtTjWUrT7MPmdRsANWU4V4WRfFrW2fIUJa8KzfdrYI9Aw2Ahn2ASA993Rvaepp6pCUAER/Vbq5b0qNggWADRujjjtL64eUuJtGru+9TBs7cz0IYySVjnfVkjUg7lYYkaYd0WxZHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747323425; 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=D2AEhmGA9EIPhaKM1OQkdMOkud8gznhJwIFJD0pn0HA=; b=KpmyqFrHk/m+NrSCFXNlyrzglbbakJ63g40dT/M4bSS8qyBuQJoX54p5NNL+4OX4D4qYQ+mWC0lYaNcw584OnaGwHTp4ajFvOVVEbwNTT2YMuKVhPhHuGYQFhvkvSdCWcTM0xd1kOL2mkuoirE79ijunuyW0SNPPBWLnDt3v3Z8= 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 1747323425953549.8723675184624; Thu, 15 May 2025 08:37:05 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id E5AC312E2; Thu, 15 May 2025 11:37:04 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 799871488; Thu, 15 May 2025 11:30:10 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5070D1347; Thu, 15 May 2025 11:29:54 -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 EE8E911A7 for ; Thu, 15 May 2025 11:29:39 -0400 (EDT) Received: from mx-prod-mc-04.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-314-5Ot-x5K9O5q8dfkbDc7Kxw-1; Thu, 15 May 2025 11:29:38 -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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A6D5919560B1 for ; Thu, 15 May 2025 15:29:37 +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 A66EC180045B; Thu, 15 May 2025 15:29:36 +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=1747322979; 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=dS1x9VAprL3d6fxrSKyil4Ox2iCWSD48SxfA6bvXD8M=; b=R5O8/C7DlbYWYgr6J5J5LquVY9bgsJqOxfl61AP5/Ir9VRfo3Hd8R+G2u4HLuxQzZ6YAll /MTunTSM/NsUlIcJoeY8PU0EUZL+7T62NGrfh0YFBJC1Xv0XgGE5tM5Mb2qwLjfGBxCNEi eaXpwN0gN5eTVM5m3WPxZnC9NZ/f3XY= X-MC-Unique: 5Ot-x5K9O5q8dfkbDc7Kxw-1 X-Mimecast-MFC-AGG-ID: 5Ot-x5K9O5q8dfkbDc7Kxw_1747322977 To: devel@lists.libvirt.org Subject: [PATCH 17/17] qemuDomainRemoveInactive: Remove 'driver' argument Date: Thu, 15 May 2025 17:29:02 +0200 Message-ID: <848760d6caecd9ba7779b96af6e6edd9d8789cae.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: xO-3PBY1Ps4zXkKbkhkdQcFAd5yVzj6KMg4tlP2foDg_1747322977 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: AAOI4VAK5SX7INCCAUX4LPFGF27M6MUX X-Message-ID-Hash: AAOI4VAK5SX7INCCAUX4LPFGF27M6MUX 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: 1747323426529116600 Content-Type: text/plain; charset="utf-8" From: Peter Krempa The function can fetch it from @vm. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- src/qemu/qemu_domain.c | 5 ++--- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_driver.c | 20 ++++++++++---------- src/qemu/qemu_migration.c | 12 ++++++------ src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_snapshot.c | 4 ++-- 6 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 90258e9603..a7e4198316 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5825,8 +5825,7 @@ qemuDomainRemoveInactiveCommon(virDomainObj *vm, * The caller must hold a lock to the vm. */ void -qemuDomainRemoveInactive(virQEMUDriver *driver, - virDomainObj *vm, +qemuDomainRemoveInactive(virDomainObj *vm, virDomainUndefineFlagsValues flags, bool migration) { @@ -5837,7 +5836,7 @@ qemuDomainRemoveInactive(virQEMUDriver *driver, qemuDomainRemoveInactiveCommon(vm, flags, migration); - virDomainObjListRemove(driver->domains, vm); + virDomainObjListRemove(QEMU_DOMAIN_PRIVATE(vm)->driver->domains, vm); } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 56683848aa..ee6074c9f6 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -691,8 +691,7 @@ int qemuDomainMomentDiscardAll(void *payload, const char *name, void *data); -void qemuDomainRemoveInactive(virQEMUDriver *driver, - virDomainObj *vm, +void qemuDomainRemoveInactive(virDomainObj *vm, virDomainUndefineFlagsValues flags, bool migration); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 50a5cdd594..893fa0c66c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1577,7 +1577,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, goto cleanup; if (qemuProcessBeginJob(vm, VIR_DOMAIN_JOB_OPERATION_START, flags) < 0= ) { - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); goto cleanup; } @@ -1586,7 +1586,7 @@ static virDomainPtr qemuDomainCreateXML(virConnectPtr= conn, VIR_NETDEV_VPORT_PROFILE_OP_CREATE, start_flags) < 0) { virDomainAuditStart(vm, "booted", false); - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); qemuProcessEndJob(vm); goto cleanup; } @@ -2071,7 +2071,7 @@ qemuDomainDestroyFlags(virDomainPtr dom, ret =3D 0; endjob: if (ret =3D=3D 0) - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); qemuProcessEndStopJob(vm); cleanup: @@ -2707,7 +2707,7 @@ qemuDomainSaveInternal(virQEMUDriver *driver, } virDomainObjEndAsyncJob(vm); if (ret =3D=3D 0) - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); cleanup: virQEMUSaveDataFree(data); @@ -3243,7 +3243,7 @@ qemuDomainCoreDumpWithFormat(virDomainPtr dom, virDomainObjEndAsyncJob(vm); if (ret =3D=3D 0 && flags & VIR_DUMP_CRASH) - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); cleanup: virDomainObjEndAPI(&vm); @@ -3563,7 +3563,7 @@ processGuestPanicEvent(virQEMUDriver *driver, endjob: virDomainObjEndAsyncJob(vm); if (removeInactive) - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); } @@ -3891,7 +3891,7 @@ processMonitorEOFEvent(virQEMUDriver *driver, virObjectEventStateQueue(driver->domainEventState, event); endjob: - qemuDomainRemoveInactive(driver, vm, 0, migration); + qemuDomainRemoveInactive(vm, 0, migration); qemuProcessEndStopJob(vm); } @@ -5853,7 +5853,7 @@ qemuDomainRestoreInternal(virConnectPtr conn, virFileWrapperFdFree(wrapperFd); virQEMUSaveDataFree(data); if (vm && ret < 0) - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); virDomainObjEndAPI(&vm); return ret; } @@ -6505,7 +6505,7 @@ qemuDomainDefineXMLFlags(virConnectPtr conn, } else { /* Brand new domain. Remove it */ VIR_INFO("Deleting domain '%s'", vm->def->name); - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); } } @@ -6648,7 +6648,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, */ vm->persistent =3D 0; if (!virDomainObjIsActive(vm)) - qemuDomainRemoveInactive(driver, vm, flags, false); + qemuDomainRemoveInactive(vm, flags, false); ret =3D 0; endjob: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index f38733f904..2a01ca58bd 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3609,7 +3609,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver, * and there is no 'goto cleanup;' in the middle of those */ VIR_FREE(priv->origname); virDomainObjRemoveTransientDef(vm); - qemuDomainRemoveInactive(driver, vm, 0, true); + qemuDomainRemoveInactive(vm, 0, true); } virDomainObjEndAPI(&vm); virErrorRestore(&origErr); @@ -4256,7 +4256,7 @@ qemuMigrationSrcConfirm(virQEMUDriver *driver, virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent =3D 0; } - qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM, true= ); + qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true); } cleanup: @@ -6335,7 +6335,7 @@ qemuMigrationSrcPerformJob(virQEMUDriver *driver, virDomainDeleteConfig(cfg->configDir, cfg->autostartDir, vm); vm->persistent =3D 0; } - qemuDomainRemoveInactive(driver, vm, 0, true); + qemuDomainRemoveInactive(vm, 0, true); } virErrorRestore(&orig_err); @@ -6420,7 +6420,7 @@ qemuMigrationSrcPerformPhase(virQEMUDriver *driver, } if (!virDomainObjIsActive(vm)) - qemuDomainRemoveInactive(driver, vm, 0, true); + qemuDomainRemoveInactive(vm, 0, true); return ret; } @@ -6977,7 +6977,7 @@ qemuMigrationDstFinishActive(virQEMUDriver *driver, } if (!qemuDomainObjIsActive(vm)) - qemuDomainRemoveInactive(driver, vm, VIR_DOMAIN_UNDEFINE_TPM, true= ); + qemuDomainRemoveInactive(vm, VIR_DOMAIN_UNDEFINE_TPM, true); virErrorRestore(&orig_err); return NULL; @@ -7113,7 +7113,7 @@ qemuMigrationProcessUnattended(virQEMUDriver *driver, qemuMigrationJobFinish(vm); if (!virDomainObjIsActive(vm)) - qemuDomainRemoveInactive(driver, vm, 0, true); + qemuDomainRemoveInactive(vm, 0, true); } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 9d53768fed..ae54c807eb 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -9273,7 +9273,7 @@ qemuProcessAutoDestroy(virDomainObj *dom, VIR_DOMAIN_EVENT_STOPPED, VIR_DOMAIN_EVENT_STOPPED_DESTROYED); - qemuDomainRemoveInactive(driver, dom, 0, !!(stopFlags & VIR_QEMU_PROCE= SS_STOP_MIGRATED)); + qemuDomainRemoveInactive(dom, 0, !!(stopFlags & VIR_QEMU_PROCESS_STOP_= MIGRATED)); qemuProcessEndStopJob(dom); @@ -9795,7 +9795,7 @@ qemuProcessReconnect(void *opaque) if (jobStarted) virDomainObjEndJob(obj); if (!virDomainObjIsActive(obj)) - qemuDomainRemoveInactive(driver, obj, 0, false); + qemuDomainRemoveInactive(obj, 0, false); virDomainObjEndAPI(&obj); virIdentitySetCurrent(NULL); return; diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c index a17b976381..8128154749 100644 --- a/src/qemu/qemu_snapshot.c +++ b/src/qemu/qemu_snapshot.c @@ -2698,7 +2698,7 @@ qemuSnapshotRevertActive(virDomainObj *vm, error: if (!virDomainObjIsActive(vm)) - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); return -1; } @@ -2823,7 +2823,7 @@ qemuSnapshotRevertInactive(virDomainObj *vm, error: if (!virDomainObjIsActive(vm)) - qemuDomainRemoveInactive(driver, vm, 0, false); + qemuDomainRemoveInactive(vm, 0, false); return -1; } --=20 2.49.0