[PATCH qemu-server] blockdev: recognize pflash devices on virt machines

[PATCH qemu-server] blockdev: recognize pflash devices on virt machines

[Lukas Sichert]

On ARM, QEMU's virt machine exposes EFI firmware pflash devices as
'/machine/virt.flash0' and '/machine/virt.flash1'. The query-block
mapping only recognized the x86-style '/machine/system.flash*' paths, so
it failed to translate '/machine/virt.flash1' to 'efidisk0'. This made
live cloning fail with 'no block node found for drive 'drive-efidisk0'.'

Accept both system.flash* and virt.flash* paths for these devices.

Signed-off-by: Lukas Sichert <l.sichert@proxmox.com>
---
 src/PVE/QemuServer/Blockdev.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm
index 101c747c..08a5acf8 100644
--- a/src/PVE/QemuServer/Blockdev.pm
+++ b/src/PVE/QemuServer/Blockdev.pm
@@ -72,9 +72,9 @@ sub qdev_id_to_drive_id {
 
     if ($qdev_id =~ m|^/machine/peripheral/(virtio(\d+))/virtio-backend$|) {
         return $1;
-    } elsif ($qdev_id =~ m|^/machine/system\.flash0$|) {
+    } elsif ($qdev_id =~ m{^/machine/(?:system|virt)\.flash0$}) {
         return 'pflash0';
-    } elsif ($qdev_id =~ m|^/machine/system\.flash1$|) {
+    } elsif ($qdev_id =~ m{^/machine/(?:system|virt)\.flash1$}) {
         return 'efidisk0';
     }
 
-- 
2.47.3