From nobody Mon Feb 9 02:47:00 2026 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 --- 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