From nobody Tue Sep 9 03:20:39 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=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 --- 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