From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
	by lore.proxmox.com (Postfix) with ESMTPS id B93FC1FF183
	for <inbox@lore.proxmox.com>; Wed, 18 Jun 2025 15:03:30 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 5494412669;
	Wed, 18 Jun 2025 15:02:28 +0200 (CEST)
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 18 Jun 2025 15:02:02 +0200
Message-Id: <20250618130209.90649-26-f.ebner@proxmox.com>
X-Mailer: git-send-email 2.39.5
In-Reply-To: <20250618130209.90649-1-f.ebner@proxmox.com>
References: <20250618130209.90649-1-f.ebner@proxmox.com>
MIME-Version: 1.0
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.031 Adjusted score from AWL reputation of From: address
 BAYES_00                 -1.9 Bayes spam probability is 0 to 1%
 DMARC_MISSING             0.1 Missing DMARC policy
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
 SPF_PASS               -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH qemu-server v2 25/32] vm devices list: prepare
 querying block device names for -blockdev
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>

From: Alexandre Derumier via pve-devel <pve-devel@lists.proxmox.com>

Look at the 'qdev' value, because the 'device' property is not
initialized with '-blockdev'. This can be seen in the QEMU source code
(the device property is the name of the block backend and blk->name is
assigned a value only in a code path reached via drive_new()). This
most likely was done to avoid confusion/clashes, since with
'-blockdev', the node that's inserted for a front-end device can
change and then both the block backend and the node would be named
the same, but not connected.

Signed-off-by: Alexandre Derumier <alexandre.derumier@groupe-cyllene.com>
[FE: fix commit message and comment - it does not depend on the presence of media
     escape dot in regex
     skip right away if qdev is undef to avoid warning when regex matching]
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---

Newly included in v2, makes hot{,un}plug after switch to -blockdev
work.

 src/PVE/QemuServer.pm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 843db76a..f8adb890 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -4249,11 +4249,19 @@ sub vm_devices_list {
         $devices_to_check = $to_check;
     }
 
+    # Block device IDs need to be checked at the qdev level, since with '-blockdev', the 'device'
+    # property will not be set.
     my $resblock = mon_cmd($vmid, 'query-block');
-    foreach my $block (@$resblock) {
-        if ($block->{device} =~ m/^drive-(\S+)/) {
-            $devices->{$1} = 1;
+    for my $block ($resblock->@*) {
+        my $qdev_id = $block->{qdev} or next;
+        if ($qdev_id =~ m|^/machine/peripheral/(virtio(\d+))/virtio-backend$|) {
+            $qdev_id = $1;
+        } elsif ($qdev_id =~ m|^/machine/system\.flash0$|) {
+            $qdev_id = 'pflash0';
+        } elsif ($qdev_id =~ m|^/machine/system\.flash1$|) {
+            $qdev_id = 'efidisk0';
         }
+        $devices->{$qdev_id} = 1;
     }
 
     my $resmice = mon_cmd($vmid, 'query-mice');
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel