From nobody Mon Feb 9 05:43: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=1770304501; cv=none; d=zohomail.com; s=zohoarc; b=VTubVY7w6KQrtBzoL5CBYbPERDVTjDDVvdByiifQQYTwOvpvDY+cMVbODaK/yij38NiyqS23t5M7hpKjv7u26h49MS2Z44hRPSTfCAqFcGmlF8wUNb8QXzpW3wrGevATXeuwgnMXFFbq0sjHOc+Cetzwwnrl0OlPEp6K0Zk/jBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770304501; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=eFznxlccl+crjUO9nrcDJuRRqafvcQN8rTFmeXJRI+M=; b=fHaU25Fl9iPbKiJq3fsJiAo8gponyC0kBVN19tda6W+s6rGYDpwsw/PqbikrT2HZPTPVvhl/tv6lf0Dg9zRxSa3tGd/qFVbRAYyDH1JXTNVyxnrpcXG3HSD5eDGkU7AsN/H074pc5W/peX2AMh12Y2HwKoSnfF6NWs3HyI4tglE= 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 1770304501139908.3745383262972; Thu, 5 Feb 2026 07:15:01 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id A72E6417EB; Thu, 5 Feb 2026 10:15:00 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 1E0D343E54; Thu, 5 Feb 2026 10:00:04 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id D62A243DBD; Thu, 5 Feb 2026 09:59:42 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 971BF41B27 for ; Thu, 5 Feb 2026 09:55:52 -0500 (EST) 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-455-hU_xgjKiPD6so8aPA9ryNQ-1; Thu, 05 Feb 2026 09:55:51 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 308AE1800265 for ; Thu, 5 Feb 2026 14:55:50 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.3]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7A4841800464 for ; Thu, 5 Feb 2026 14:55:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770303352; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eFznxlccl+crjUO9nrcDJuRRqafvcQN8rTFmeXJRI+M=; b=XrmyyVsqvh7HBXaXfUIOEZyA+U5rbRsWkVE0kT6BUxHqkWrXTt7xDjIZqZfCwaq5woKiGR DfWtK+ZYxGno7p26maw1E8y39cUvnv4AR+ZkxpsUx1h6H5OU7XU32RJ0/9FaGkZvV5jv3b euExh2Yu8gEmv76Xj8+cYf0I44vbEvc= X-MC-Unique: hU_xgjKiPD6so8aPA9ryNQ-1 X-Mimecast-MFC-AGG-ID: hU_xgjKiPD6so8aPA9ryNQ_1770303350 To: devel@lists.libvirt.org Subject: [PATCH 17/20] qemuProcessUpdateVideoRamSize: Remove 'driver' argument and adjust callers Date: Thu, 5 Feb 2026 15:55:25 +0100 Message-ID: <1b137b036cb68f71c99e6cbd542a3011e146e043.1770303113.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: -8q4FHbYtt8A5xxqgxWwsU-jJLT-1MM5c6DTE1dL_bg_1770303350 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: L75G3GDTEQOYKGKTN634DQG2AH7YJ2EZ X-Message-ID-Hash: L75G3GDTEQOYKGKTN634DQG2AH7YJ2EZ X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1770304502987154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa 'driver' is part of domain's private data. Use it directly and adjust all callers recursively. Signed-off-by: Peter Krempa --- src/qemu/qemu_driver.c | 10 ++++------ src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_process.c | 15 ++++++--------- src/qemu/qemu_process.h | 3 +-- src/qemu/qemu_saveimage.c | 2 +- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index cdd333c882..a81a4054d6 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -1966,7 +1966,6 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) int ret =3D -1; qemuDomainObjPrivate *priv; virDomainState state; - virQEMUDriver *driver =3D dom->conn->privateData; virCheckFlags(0, -1); @@ -2001,7 +2000,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) if (state =3D=3D VIR_DOMAIN_CRASHED) virDomainObjSetState(vm, VIR_DOMAIN_PAUSED, VIR_DOMAIN_PAUSED_CRAS= HED); - qemuProcessRefreshState(driver, vm, VIR_ASYNC_JOB_NONE); + qemuProcessRefreshState(vm, VIR_ASYNC_JOB_NONE); endjob: virDomainObjEndJob(vm); @@ -4035,13 +4034,12 @@ processMemoryDeviceSizeChange(virQEMUDriver *driver, static void -processResetEvent(virQEMUDriver *driver, - virDomainObj *vm) +processResetEvent(virDomainObj *vm) { if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) return; - qemuProcessRefreshState(driver, vm, VIR_ASYNC_JOB_NONE); + qemuProcessRefreshState(vm, VIR_ASYNC_JOB_NONE); virDomainObjEndJob(vm); } @@ -4133,7 +4131,7 @@ static void qemuProcessEventHandler(void *data, void = *opaque) processEvent->status); break; case QEMU_PROCESS_EVENT_RESET: - processResetEvent(driver, vm); + processResetEvent(vm); break; case QEMU_PROCESS_EVENT_NBDKIT_EXITED: processNbdkitExitedEvent(vm, processEvent->data); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 88db5e93fa..0e097f25b1 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -6805,7 +6805,7 @@ qemuMigrationDstFinishFresh(virQEMUDriver *driver, /* Now that the state data was transferred we can refresh the actual s= tate * of the devices */ - if (qemuProcessRefreshState(driver, vm, VIR_ASYNC_JOB_MIGRATION_IN) < = 0) { + if (qemuProcessRefreshState(vm, VIR_ASYNC_JOB_MIGRATION_IN) < 0) { /* Similarly to the case above v2 protocol will not be able to rec= over * from this. Let's ignore this and perhaps stuff will not break. = */ if (v3proto) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0b78d45ef6..2628a89cbf 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -3225,8 +3225,7 @@ qemuProcessCleanupChardevDevice(virDomainDef *def G_G= NUC_UNUSED, * migration. */ static int -qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, - virDomainObj *vm, +qemuProcessUpdateVideoRamSize(virDomainObj *vm, int asyncJob) { int ret =3D -1; @@ -3296,8 +3295,8 @@ qemuProcessUpdateVideoRamSize(virQEMUDriver *driver, qemuDomainObjExitMonitor(vm); - cfg =3D virQEMUDriverGetConfig(driver); - ret =3D virDomainObjSave(vm, driver->xmlopt, cfg->stateDir); + cfg =3D virQEMUDriverGetConfig(priv->driver); + ret =3D virDomainObjSave(vm, priv->driver->xmlopt, cfg->stateDir); return ret; @@ -8690,7 +8689,6 @@ qemuProcessRefreshDisks(virDomainObj *vm, /** * qemuProcessRefreshState: - * @driver: qemu driver data * @vm: domain to refresh * @asyncJob: async job type * @@ -8699,8 +8697,7 @@ qemuProcessRefreshDisks(virDomainObj *vm, * state influenced by the migration stream. */ int -qemuProcessRefreshState(virQEMUDriver *driver, - virDomainObj *vm, +qemuProcessRefreshState(virDomainObj *vm, virDomainAsyncJob asyncJob) { VIR_DEBUG("Fetching list of active devices"); @@ -8712,7 +8709,7 @@ qemuProcessRefreshState(virQEMUDriver *driver, return -1; VIR_DEBUG("Detecting actual memory size for video device"); - if (qemuProcessUpdateVideoRamSize(driver, vm, asyncJob) < 0) + if (qemuProcessUpdateVideoRamSize(vm, asyncJob) < 0) return -1; VIR_DEBUG("Updating disk data"); @@ -8839,7 +8836,7 @@ qemuProcessStart(virConnectPtr conn, /* Refresh state of devices from QEMU. During migration this happe= ns * in qemuMigrationDstFinish to ensure that state information is f= ully * transferred. */ - if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) + if (qemuProcessRefreshState(vm, asyncJob) < 0) goto stop; } diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index df63cac9b8..d96502b601 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -163,8 +163,7 @@ int qemuProcessFinishStartup(virQEMUDriver *driver, bool startCPUs, virDomainPausedReason pausedReason); -int qemuProcessRefreshState(virQEMUDriver *driver, - virDomainObj *vm, +int qemuProcessRefreshState(virDomainObj *vm, virDomainAsyncJob asyncJob); typedef enum { diff --git a/src/qemu/qemu_saveimage.c b/src/qemu/qemu_saveimage.c index cdfa9be09d..23922acd51 100644 --- a/src/qemu/qemu_saveimage.c +++ b/src/qemu/qemu_saveimage.c @@ -759,7 +759,7 @@ qemuSaveImageStartVM(virConnectPtr conn, VIR_DOMAIN_EVENT_STARTED_RESTORED); virObjectEventStateQueue(driver->domainEventState, event); - if (qemuProcessRefreshState(driver, vm, asyncJob) < 0) + if (qemuProcessRefreshState(vm, asyncJob) < 0) goto cleanup; /* If it was running before, resume it now unless caller requested pau= se. */ --=20 2.53.0