From nobody Fri Dec 12 14:05:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1765363171; cv=none; d=zohomail.com; s=zohoarc; b=UwvxnYwozZGYo9sMmXZTuk69H8swqBZQgLi0ktdVRwoHrRE2wPUSYGEvz9vsYGeL4Wiad5hk+CsF1nAwOlSDuU2q/bWDMYkgsNiAn2Tsezgkw6sOrrVtviSqB1mJqccjzMjeo+spEJE7qiiKIFSEWlrU/c9ijSUp0SKkGuCNxO4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1765363171; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=35+GL7RNnmKAyQLSD1PNrO1+1o8Sa3oGvW5pBEdpL8o=; b=eXWPlyNclBo0c1gJ90o3esXQwnVTsff4kLmEQ4FVMXIBkzah8RR5pvL1CTEJcPyCQ5QrN9dmVnCRu1xecGg0Win1GNiVjUBOtWOrv/BYHgHNEmweqY5fvkViXoETiyJ4p+L7QA/JlcoNn0zCSBxk1tL2zmi/XLSp6zwGjAe+Rgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1765363171624644.8955369259105; Wed, 10 Dec 2025 02:39:31 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id CE6DF41BEA; Wed, 10 Dec 2025 05:39:30 -0500 (EST) Received: from [172.19.199.80] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id C249B43DED; Wed, 10 Dec 2025 05:38:42 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2EF9F41B42; Wed, 10 Dec 2025 05:32:39 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3802641B45 for ; Wed, 10 Dec 2025 05:32:38 -0500 (EST) Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-640-0cuWXrMqO8-4NdqduredwA-1; Wed, 10 Dec 2025 05:32:36 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0922B195609D for ; Wed, 10 Dec 2025 10:32:36 +0000 (UTC) Received: from speedmetal.openshiftapps.com (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5528830001A5 for ; Wed, 10 Dec 2025 10:32:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,RCVD_IN_SBL_CSS, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1765362757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=35+GL7RNnmKAyQLSD1PNrO1+1o8Sa3oGvW5pBEdpL8o=; b=M0h6Z4zmAL4jwXfmv6kA/QYzBJbbc0shPM4J2OZBuH8FKhvORq5eEMj31AnHlCsmIaLLNh rQI6l/8Bz2MArYswseennPRyadPAtdoBv8FDXVTLHFe9Unctb6T60i/aHFo3TqYHPcjxYF hRgBpwgGcLpJYpdjsciPzH/6FVXtYwU= X-MC-Unique: 0cuWXrMqO8-4NdqduredwA-1 X-Mimecast-MFC-AGG-ID: 0cuWXrMqO8-4NdqduredwA_1765362756 To: devel@lists.libvirt.org Subject: [PATCH 02/10] qemuHotplugAttachDBusVMState: Remove 'driver' argument Date: Wed, 10 Dec 2025 11:32:23 +0100 Message-ID: <90972bea5d10134e90dc95ff4f8210f23d9a3db7.1765362608.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 70Q546BALSvUIwDuu_aM2PXT7oAPPQ2RWR5AiieVf3w_1765362756 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 32K3DPHNQTDWBL4O4NBA4HX6JKCXFYBO X-Message-ID-Hash: 32K3DPHNQTDWBL4O4NBA4HX6JKCXFYBO X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1765363172961158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa We pass in 'vm' which contains it in the private data. Signed-off-by: Peter Krempa --- src/qemu/qemu_hotplug.c | 6 ++---- src/qemu/qemu_hotplug.h | 3 +-- src/qemu/qemu_migration.c | 9 ++++----- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index fb426deb1a..fccbef5d0c 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -330,7 +330,6 @@ qemuHotplugWaitForTrayEject(virDomainObj *vm, /** * qemuHotplugAttachDBusVMState: - * @driver: QEMU driver object * @vm: domain object * @asyncJob: asynchronous job identifier * @@ -339,8 +338,7 @@ qemuHotplugWaitForTrayEject(virDomainObj *vm, * Returns: 0 on success, -1 on error. */ int -qemuHotplugAttachDBusVMState(virQEMUDriver *driver, - virDomainObj *vm, +qemuHotplugAttachDBusVMState(virDomainObj *vm, virDomainAsyncJob asyncJob) { qemuDomainObjPrivate *priv =3D vm->privateData; @@ -355,7 +353,7 @@ qemuHotplugAttachDBusVMState(virQEMUDriver *driver, return 0; } - if (!(props =3D qemuBuildDBusVMStateInfoProps(driver, vm))) + if (!(props =3D qemuBuildDBusVMStateInfoProps(priv->driver, vm))) return -1; if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index fb0b5b6cd7..e6c90253e4 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -120,8 +120,7 @@ unsigned long long qemuDomainGetUnplugTimeout(virDomainObj *vm) ATTRIBUTE_MOCKABLE; int -qemuHotplugAttachDBusVMState(virQEMUDriver *driver, - virDomainObj *vm, +qemuHotplugAttachDBusVMState(virDomainObj *vm, virDomainAsyncJob asyncJob); int diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 1371742529..a64a98046a 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4602,15 +4602,14 @@ qemuMigrationSrcContinue(virDomainObj *vm, static int -qemuMigrationSetDBusVMState(virQEMUDriver *driver, - virDomainObj *vm) +qemuMigrationSetDBusVMState(virDomainObj *vm) { qemuDomainObjPrivate *priv =3D vm->privateData; if (priv->dbusVMStateIds) { int rv; - if (qemuHotplugAttachDBusVMState(driver, vm, VIR_ASYNC_JOB_NONE) <= 0) + if (qemuHotplugAttachDBusVMState(vm, VIR_ASYNC_JOB_NONE) < 0) return -1; if (qemuDomainObjEnterMonitorAsync(vm, VIR_ASYNC_JOB_NONE) < 0) @@ -5097,7 +5096,7 @@ qemuMigrationSrcRun(virQEMUDriver *driver, } } - if (qemuMigrationSetDBusVMState(driver, vm) < 0) + if (qemuMigrationSetDBusVMState(vm) < 0) goto error; /* Before EnterMonitor, since already qemuProcessStopCPUs does that */ @@ -7268,7 +7267,7 @@ qemuMigrationSrcToFile(virQEMUDriver *driver, virDoma= inObj *vm, unsigned long saveMigBandwidth =3D priv->migMaxBandwidth; virErrorPtr orig_err =3D NULL; - if (qemuMigrationSetDBusVMState(driver, vm) < 0) + if (qemuMigrationSetDBusVMState(vm) < 0) return -1; /* Increase migration bandwidth to unlimited since target is a file. --=20 2.52.0