From: Nick Labich <nick@labich.org>
Date: Wed, 8 Oct 2025 23:35:25 +0000 (-0400)
Subject: vmspawn: Use virtio-blk-pci for extra drives
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1df624422a23b28d0a18ae60af50a95c51c6d43a;p=thirdparty%2Fsystemd.git

vmspawn: Use virtio-blk-pci for extra drives

Fixes #39262
---

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index f471e1bde52..14ff13c328d 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -2101,12 +2101,6 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
                         return log_oom();
         }
 
-        if (strv_length(arg_extra_drives) > 0) {
-                r = strv_extend_many(&cmdline, "-device", "virtio-scsi-pci,id=scsi");
-                if (r < 0)
-                        return log_oom();
-        }
-
         if (kernel) {
                 r = strv_extend_many(&cmdline, "-kernel", kernel);
                 if (r < 0)
@@ -2255,7 +2249,7 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
                 if (strv_extend(&cmdline, "-device") < 0)
                         return log_oom();
 
-                if (strv_extendf(&cmdline, "scsi-hd,drive=vmspawn_extra_%zu,serial=%s", i++, escaped_drive_fn) < 0)
+                if (strv_extendf(&cmdline, "virtio-blk-pci,drive=vmspawn_extra_%zu,serial=%s", i++, escaped_drive_fn) < 0)
                         return log_oom();
         }