From 74a07cb774cd9c8372a5e6868bdfdad9961dbee5 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Mon, 20 Apr 2026 11:07:38 +0200 Subject: [PATCH] vmspawn: use qemu_device_driver_to_string() in resolve_disk_driver MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Drop the inline DiskType → QEMU device driver switch and call the shared helper instead. serial_max and the CD-ROM read-only flag stay inline since they are vmspawn-local. Signed-off-by: Christian Brauner (Amutable) --- src/vmspawn/vmspawn.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c index 1b696f70144..7ed21af77b1 100644 --- a/src/vmspawn/vmspawn.c +++ b/src/vmspawn/vmspawn.c @@ -2273,7 +2273,6 @@ static int qemu_config_add_qmp_monitor(FILE *config_file, int bridge_fds[2], int } static int resolve_disk_driver(DiskType dt, const char *filename, DriveInfo *info) { - const char *driver; size_t serial_max; int r; @@ -2282,19 +2281,15 @@ static int resolve_disk_driver(DiskType dt, const char *filename, DriveInfo *inf switch (dt) { case DISK_TYPE_VIRTIO_BLK: - driver = "virtio-blk-pci"; serial_max = DISK_SERIAL_MAX_LEN_VIRTIO_BLK; break; case DISK_TYPE_VIRTIO_SCSI: - driver = "scsi-hd"; serial_max = DISK_SERIAL_MAX_LEN_SCSI; break; case DISK_TYPE_NVME: - driver = "nvme"; serial_max = DISK_SERIAL_MAX_LEN_NVME; break; case DISK_TYPE_VIRTIO_SCSI_CDROM: - driver = "scsi-cd"; serial_max = DISK_SERIAL_MAX_LEN_SCSI; info->flags |= QMP_DRIVE_READ_ONLY; break; @@ -2302,7 +2297,7 @@ static int resolve_disk_driver(DiskType dt, const char *filename, DriveInfo *inf assert_not_reached(); } - info->disk_driver = strdup(driver); + info->disk_driver = strdup(ASSERT_PTR(qemu_device_driver_to_string(dt))); if (!info->disk_driver) return log_oom(); -- 2.47.3