From nobody Mon Feb 9 10:51:42 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=1770303773; cv=none; d=zohomail.com; s=zohoarc; b=a8Nfyn1s+XZ7zHP/dridoc5KKK1PS6xZRL2+hVO7/JbKT6c2UreZscQUXYWln/xQEun8OO7V8iut/hkJOYQVxwd1oulYRbY1VL0z09c7wlbCNQlcTeWB/izz+PwmahKwntn2pstj40E/kjJ3mWTZf5hGXYBkjm1bEu0isyjF1fw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770303773; 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=/OPTZY56i4sX2Uq8vH6z2nsLBf/AGwi8RVIBs8WRvOk=; b=hdn0qdEwo17haYJhHLNtolrrwmk5odnTSPkYE8Qt32qiJENwTarZ4nWkA9ykmL6wDlgV7T1ZtCW9larBlMgzNoOcawziUVFPNZp28qVjKIiDeDxWVi40uq9s6DhcjpIeGllo1Dcqadk+DrLn7+r5KenjJju/E1mAdxhxCGDxA5w= 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 1770303773160667.048960405742; Thu, 5 Feb 2026 07:02:53 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 2AC0E43EA9; Thu, 5 Feb 2026 10:02:52 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id AFFE643ECF; Thu, 5 Feb 2026 09:57:01 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id A47AC41A10; Thu, 5 Feb 2026 09:56:53 -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 73FA741B9F for ; Thu, 5 Feb 2026 09:55:41 -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-619-KP0qXEGvMIuRvBdpSjlhIw-1; Thu, 05 Feb 2026 09:55:38 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 821B31955F44 for ; Thu, 5 Feb 2026 14:55:37 +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 CC04C180066A for ; Thu, 5 Feb 2026 14:55:36 +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=1770303341; 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=/OPTZY56i4sX2Uq8vH6z2nsLBf/AGwi8RVIBs8WRvOk=; b=RdnoI0cgAFwn/ZCqwr7CbG75+fCNHjVSLiJ4DqYit4TddHMBX24IPU+4+C+X9JzsxjAlFz dPPtpROEpiVA3zJ940FhROy4OCQRSGM5hGg0kp+VlQ7TjXy9OzO7+31aQCaEszSGkHMS0P ZcAFBVVVtoHVX4zcg6mvHoP7hqnjIqQ= X-MC-Unique: KP0qXEGvMIuRvBdpSjlhIw-1 X-Mimecast-MFC-AGG-ID: KP0qXEGvMIuRvBdpSjlhIw_1770303337 To: devel@lists.libvirt.org Subject: [PATCH 06/20] qemu: process: Unexport 'qemuProcessRefreshDisks' Date: Thu, 5 Feb 2026 15:55:14 +0100 Message-ID: <6161b346b339db73e6661f9044c01750111bce84.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: 81bEbE6VqdB2VzooCyFXwRy206KSz3mtgz0IAdK-ASk_1770303337 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 4XGVIKQ63F6FT2TCNSAXGNIHLJEZ5BPV X-Message-ID-Hash: 4XGVIKQ63F6FT2TCNSAXGNIHLJEZ5BPV 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: 1770303775782154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Since it's currently called above the place where it is defined we also need to move it within qemu_process.c. Signed-off-by: Peter Krempa --- src/qemu/qemu_process.c | 98 ++++++++++++++++++++--------------------- src/qemu/qemu_process.h | 3 -- 2 files changed, 49 insertions(+), 52 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c130483659..ba8bda0f99 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -8639,6 +8639,55 @@ qemuProcessRefreshRxFilters(virDomainObj *vm, } +static int +qemuProcessRefreshDisks(virDomainObj *vm, + virDomainAsyncJob asyncJob) +{ + qemuDomainObjPrivate *priv =3D vm->privateData; + virQEMUDriver *driver =3D priv->driver; + g_autoptr(GHashTable) table =3D NULL; + size_t i; + + if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) =3D=3D 0) { + table =3D qemuMonitorGetBlockInfo(priv->mon); + qemuDomainObjExitMonitor(vm); + } + + if (!table) + return -1; + + for (i =3D 0; i < vm->def->ndisks; i++) { + virDomainDiskDef *disk =3D vm->def->disks[i]; + qemuDomainDiskPrivate *diskpriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); + struct qemuDomainDiskInfo *info; + const char *entryname =3D disk->info.alias; + virDomainDiskTray old_tray_status =3D disk->tray_status; + + if (diskpriv->qomName) + entryname =3D diskpriv->qomName; + + if (!(info =3D virHashLookup(table, entryname))) + continue; + + qemuProcessRefreshDiskProps(disk, info); + + if (diskpriv->tray && + old_tray_status !=3D disk->tray_status) { + virDomainEventTrayChangeReason reason =3D VIR_DOMAIN_EVENT_TRA= Y_CHANGE_OPEN; + virObjectEvent *event; + + if (disk->tray_status =3D=3D VIR_DOMAIN_DISK_TRAY_CLOSED) + reason =3D VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE; + + event =3D virDomainEventTrayChangeNewFromObj(vm, disk->info.al= ias, reason); + virObjectEventStateQueue(driver->domainEventState, event); + } + } + + return 0; +} + + /** * qemuProcessRefreshState: * @driver: qemu driver data @@ -9556,55 +9605,6 @@ qemuProcessRefreshDiskProps(virDomainDiskDef *disk, } -int -qemuProcessRefreshDisks(virDomainObj *vm, - virDomainAsyncJob asyncJob) -{ - qemuDomainObjPrivate *priv =3D vm->privateData; - virQEMUDriver *driver =3D priv->driver; - g_autoptr(GHashTable) table =3D NULL; - size_t i; - - if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) =3D=3D 0) { - table =3D qemuMonitorGetBlockInfo(priv->mon); - qemuDomainObjExitMonitor(vm); - } - - if (!table) - return -1; - - for (i =3D 0; i < vm->def->ndisks; i++) { - virDomainDiskDef *disk =3D vm->def->disks[i]; - qemuDomainDiskPrivate *diskpriv =3D QEMU_DOMAIN_DISK_PRIVATE(disk); - struct qemuDomainDiskInfo *info; - const char *entryname =3D disk->info.alias; - virDomainDiskTray old_tray_status =3D disk->tray_status; - - if (diskpriv->qomName) - entryname =3D diskpriv->qomName; - - if (!(info =3D virHashLookup(table, entryname))) - continue; - - qemuProcessRefreshDiskProps(disk, info); - - if (diskpriv->tray && - old_tray_status !=3D disk->tray_status) { - virDomainEventTrayChangeReason reason =3D VIR_DOMAIN_EVENT_TRA= Y_CHANGE_OPEN; - virObjectEvent *event; - - if (disk->tray_status =3D=3D VIR_DOMAIN_DISK_TRAY_CLOSED) - reason =3D VIR_DOMAIN_EVENT_TRAY_CHANGE_CLOSE; - - event =3D virDomainEventTrayChangeNewFromObj(vm, disk->info.al= ias, reason); - virObjectEventStateQueue(driver->domainEventState, event); - } - } - - return 0; -} - - static int qemuProcessRefreshCPUMigratability(virDomainObj *vm, virDomainAsyncJob asyncJob) diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index 426e11d79e..201b3ebb63 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -218,9 +218,6 @@ int qemuRefreshVirtioChannelState(virQEMUDriver *driver, int qemuProcessRefreshBalloonState(virDomainObj *vm, int asyncJob); -int qemuProcessRefreshDisks(virDomainObj *vm, - virDomainAsyncJob asyncJob); - int qemuProcessStartManagedPRDaemon(virDomainObj *vm) ATTRIBUTE_MOCKABLE; void qemuProcessKillManagedPRDaemon(virDomainObj *vm) ATTRIBUTE_MOCKABLE; --=20 2.53.0